encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 01:57:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Split out PrimaryKeyRelatedField and ManyPrimaryKeyRelatedField

Browse Source
This commit is contained in:
Tom Christie 2012-10-03 12:07:34 +01:00
parent f1f7f5d4e3
commit cab3b2f3f8
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rest_framework/fields.py
View File

@ -181,7 +181,6 @@ class RelatedField(Field):
Subclass this and override `convert` to define custom behaviour when Subclass this and override `convert` to define custom behaviour when
serializing related objects. serializing related objects.
""" """
def field_to_native(self, obj, field_name): def field_to_native(self, obj, field_name):
obj = getattr(obj, self.source or field_name) obj = getattr(obj, self.source or field_name)
if obj.__class__.__name__ in ('RelatedManager', 'ManyRelatedManager'): if obj.__class__.__name__ in ('RelatedManager', 'ManyRelatedManager'):
@ -202,7 +201,6 @@ class PrimaryKeyRelatedField(RelatedField):
""" """
Serializes a model related field or related manager to a pk value. Serializes a model related field or related manager to a pk value.
""" """
# Note the we use ModelRelatedField's implementation, as we want to get the # Note the we use ModelRelatedField's implementation, as we want to get the
# raw database value directly, since that won't involve another # raw database value directly, since that won't involve another
# database lookup. # database lookup.
@ -225,23 +223,34 @@ class PrimaryKeyRelatedField(RelatedField):
try: try:
obj = obj.serializable_value(self.source or field_name) obj = obj.serializable_value(self.source or field_name)
except AttributeError: except AttributeError:
field = obj._meta.get_field_by_name(field_name)[0] # RelatedObject (reverse relationship)
obj = getattr(obj, self.source or field_name) obj = getattr(obj, self.source or field_name)
if obj.__class__.__name__ == 'RelatedManager': return self.to_native(obj.pk)
return [self.to_native(item.pk) for item in obj.all()] # Forward relationship
elif isinstance(field, RelatedObject):
return self.to_native(obj.pk)
raise
if obj.__class__.__name__ == 'ManyRelatedManager':
return [self.to_native(item.pk) for item in obj.all()]
return self.to_native(obj) return self.to_native(obj)
def field_from_native(self, data, field_name, into): def field_from_native(self, data, field_name, into):
value = data.get(field_name) value = data.get(field_name)
if hasattr(value, '__iter__'): into[field_name + '_id'] = self.from_native(value)
into[field_name] = [self.from_native(item) for item in value]
else:
into[field_name + '_id'] = self.from_native(value) class ManyPrimaryKeyRelatedField(PrimaryKeyRelatedField):
def field_to_native(self, obj, field_name):
try:
obj = obj.serializable_value(self.source or field_name)
except AttributeError:
# RelatedManager (reverse relationship)
obj = getattr(obj, self.source or field_name)
return [self.to_native(item.pk) for item in obj.all()]
# Forward relationship
return [self.to_native(item.pk) for item in obj.all()]
def field_from_native(self, data, field_name, into):
try:
value = data.getlist(field_name)
except:
value = data.get(field_name)
into[field_name] = [self.from_native(item) for item in value]
class NaturalKeyRelatedField(RelatedField): class NaturalKeyRelatedField(RelatedField):