encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 21:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 4656815aa6 into 6333e48188

Browse Source
This commit is contained in:
Devon Bleibtrey 2015-04-05 01:31:52 +00:00
commit 698eea5152
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/relations.py
View File

@ -196,7 +196,7 @@ class HyperlinkedRelatedField(RelatedField):
attributes are not configured to correctly match the URL conf. attributes are not configured to correctly match the URL conf.
""" """
# Unsaved objects will not yet have a valid URL. # Unsaved objects will not yet have a valid URL.
if obj.pk is None: if hasattr(obj, 'pk') and obj.pk is None:
return None return None
lookup_value = getattr(obj, self.lookup_field) lookup_value = getattr(obj, self.lookup_field)
@ -361,7 +361,7 @@ class ManyRelatedField(Field):
def get_attribute(self, instance): def get_attribute(self, instance):
# Can't have any relationships if not created # Can't have any relationships if not created
if not instance.pk: if hasattr(instance, 'pk') and instance.pk is None:
return [] return []
relationship = get_attribute(instance, self.source_attrs) relationship = get_attribute(instance, self.source_attrs)