encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-17 03:51:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1078 from yprez/fix_1072

Browse Source 
Fix empty serializer bug
This commit is contained in:
Tom Christie 2013-09-02 01:13:51 -07:00
commit d4f5fe99ba
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/relations.py
View File

@ -264,7 +264,7 @@ class PrimaryKeyRelatedField(RelatedField):
# RelatedObject (reverse relationship) # RelatedObject (reverse relationship)
try: try:
pk = getattr(obj, self.source or field_name).pk pk = getattr(obj, self.source or field_name).pk
except ObjectDoesNotExist: except (ObjectDoesNotExist, AttributeError):
return None return None
# Forward relationship # Forward relationship

9
rest_framework/tests/test_relations_pk.py
View File

@ -283,6 +283,15 @@ class PKForeignKeyTests(TestCase):
self.assertFalse(serializer.is_valid()) self.assertFalse(serializer.is_valid())
self.assertEqual(serializer.errors, {'target': ['This field is required.']}) self.assertEqual(serializer.errors, {'target': ['This field is required.']})
def test_foreign_key_with_empty(self):
"""
Regression test for #1072
https://github.com/tomchristie/django-rest-framework/issues/1072
"""
serializer = NullableForeignKeySourceSerializer()
self.assertEqual(serializer.data['target'], None)
class PKNullableForeignKeyTests(TestCase): class PKNullableForeignKeyTests(TestCase):
def setUp(self): def setUp(self):