Skip to content

Commit

Permalink
Fix empty pk detection in HyperlinkRelatedField.get_url
Browse files Browse the repository at this point in the history
This implementation allows detection of empty values that are non-nullable, allowing the field to return None values for such cases
  • Loading branch information
jslang committed Feb 29, 2016
1 parent a568d16 commit 186c0e3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rest_framework/relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def get_url(self, obj, view_name, request, format):
attributes are not configured to correctly match the URL conf.
"""
# Unsaved objects will not yet have a valid URL.
if hasattr(obj, 'pk') and obj.pk is None:
if hasattr(obj, 'pk') and obj.pk in (None, ''):
return None

lookup_value = getattr(obj, self.lookup_field)
Expand Down
13 changes: 13 additions & 0 deletions tests/test_relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,19 @@ def test_pk_representation(self):
assert representation == self.instance.pk.int


class TestHyperlinkedRelatedField(APISimpleTestCase):
def setUp(self):
self.instance = MockObject(pk=1, name='foo')
self.field = serializers.HyperlinkedRelatedField(
view_name='example', read_only=True)
self.field.reverse = mock_reverse
self.field._context = {'request': True}

def test_representation_unsaved_object_with_non_nullable_pk(self):
representation = self.field.to_representation(MockObject(pk=''))
assert representation is None


class TestHyperlinkedIdentityField(APISimpleTestCase):
def setUp(self):
self.instance = MockObject(pk=1, name='foo')
Expand Down

0 comments on commit 186c0e3

Please sign in to comment.