encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix relations get_attribute

Browse Source
This commit is contained in:
Catstyle 2014-12-09 19:40:21 +08:00
parent 6ee591b78c
commit 0f41623c54
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/relations.py
View File

@ -85,7 +85,7 @@ class RelatedField(Field):
return queryset
def get_iterable(self, instance, source_attrs):
relationship = get_attribute(instance, source_attrs)
relationship = get_attribute(instance, source_attrs, self.required)
return relationship.all() if (hasattr(relationship, 'all')) else relationship
@property
@ -134,10 +134,10 @@ class PrimaryKeyRelatedField(RelatedField):
# the related object. We return this directly instead of returning the
# object itself, which would require a database lookup.
try:
instance = get_attribute(instance, self.source_attrs[:-1])
instance = get_attribute(instance, self.source_attrs[:-1], self.required)
return PKOnlyObject(pk=instance.serializable_value(self.source_attrs[-1]))
except AttributeError:
return get_attribute(instance, self.source_attrs)
return get_attribute(instance, self.source_attrs, self.required)
def get_iterable(self, instance, source_attrs):
# For consistency with `get_attribute` we're using `serializable_value()`
@ -349,7 +349,7 @@ class ManyRelatedField(Field):
]
def get_attribute(self, instance):
return self.child_relation.get_iterable(instance, self.source_attrs)
return self.child_relation.get_iterable(instance, self.source_attrs, self.required)
def to_representation(self, iterable):
return [