From 3cd3235881c921516e3b29d46ffe07e752331723 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Sun, 10 Mar 2013 21:01:51 +0100 Subject: [PATCH 1/2] Failing test to show problem of #720 --- rest_framework/tests/relations_pk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/tests/relations_pk.py b/rest_framework/tests/relations_pk.py index d6ae31760..f08e18086 100644 --- a/rest_framework/tests/relations_pk.py +++ b/rest_framework/tests/relations_pk.py @@ -407,14 +407,14 @@ class PKNullableOneToOneTests(TestCase): target.save() new_target = OneToOneTarget(name='target-2') new_target.save() - source = NullableOneToOneSource(name='source-1', target=target) + source = NullableOneToOneSource(name='source-1', target=new_target) source.save() def test_reverse_foreign_key_retrieve_with_null(self): queryset = OneToOneTarget.objects.all() serializer = NullableOneToOneTargetSerializer(queryset, many=True) expected = [ - {'id': 1, 'name': 'target-1', 'nullable_source': 1}, - {'id': 2, 'name': 'target-2', 'nullable_source': None}, + {'id': 1, 'name': 'target-1', 'nullable_source': None}, + {'id': 2, 'name': 'target-2', 'nullable_source': 1}, ] self.assertEqual(serializer.data, expected) From 126a0f739ddb19ab2525618539b526d02330dbd5 Mon Sep 17 00:00:00 2001 From: Bouke Haarsma Date: Sun, 10 Mar 2013 21:02:34 +0100 Subject: [PATCH 2/2] Fixed #720 --- rest_framework/relations.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 0c108717f..2a10e9af5 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -235,7 +235,6 @@ class PrimaryKeyRelatedField(RelatedField): pk = getattr(obj, self.source or field_name).pk except ObjectDoesNotExist: return None - return self.to_native(obj.pk) # Forward relationship return self.to_native(pk)