diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-31 21:15:55 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-31 21:15:55 +0000 |
| commit | 7475092c9facfdec98c6c01a7edbdaed53e4a07a (patch) | |
| tree | c67dfc23d0881491a94d9843d26ce934892952f4 | |
| parent | fd0c4bb76ead305a0717de978a2dc52638f8697b (diff) | |
[1.0.X] Fixed #10157: correctly set the related objects pk when assigning a reverse OneToOne. Thanks, dgouldin.
Backport of r10224 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/fields/related.py | 4 | ||||
| -rw-r--r-- | tests/modeltests/one_to_one/models.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 3e03f2cc71..c91bd22654 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -203,8 +203,8 @@ class SingleRelatedObjectDescriptor(object): (value, instance._meta.object_name, self.related.get_accessor_name(), self.related.opts.object_name)) - # Set the value of the related field - setattr(value, self.related.field.rel.get_related_field().attname, instance) + # Set the value of the related field to the value of the related object's related field + setattr(value, self.related.field.attname, getattr(instance, self.related.field.rel.get_related_field().attname)) # Since we already know what the related object is, seed the related # object caches now, too. This avoids another db hit if you get the diff --git a/tests/modeltests/one_to_one/models.py b/tests/modeltests/one_to_one/models.py index 20ac7a5573..e25e33bcc0 100644 --- a/tests/modeltests/one_to_one/models.py +++ b/tests/modeltests/one_to_one/models.py @@ -79,6 +79,8 @@ DoesNotExist: Restaurant matching query does not exist. <Restaurant: Ace Hardware the restaurant> >>> r.place <Place: Ace Hardware the place> +>>> p2.id +2 # Set the place back again, using assignment in the reverse direction. >>> p1.restaurant = r |