Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10157: correctly set the related objects pk when assig…

…ning 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
  • Loading branch information...
commit 7475092c9facfdec98c6c01a7edbdaed53e4a07a 1 parent fd0c4bb
@jacobian jacobian authored
View
4 django/db/models/fields/related.py
@@ -203,8 +203,8 @@ def __set__(self, instance, value):
(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
View
2  tests/modeltests/one_to_one/models.py
@@ -79,6 +79,8 @@ def __unicode__(self):
<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
Please sign in to comment.
Something went wrong with that request. Please try again.