summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-03-31 21:15:55 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-03-31 21:15:55 +0000
commit7475092c9facfdec98c6c01a7edbdaed53e4a07a (patch)
treec67dfc23d0881491a94d9843d26ce934892952f4 /django
parentfd0c4bb76ead305a0717de978a2dc52638f8697b (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
Diffstat (limited to 'django')
-rw-r--r--django/db/models/fields/related.py4
1 files changed, 2 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