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

Move nested serializer logic into .field_from_native()

Browse Source
This commit is contained in:
Mark Aaron Shirley 2013-01-08 09:38:15 -08:00
parent 2d62bcd5aa
commit 34e14b01e4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/serializers.py
View File

@ -216,15 +216,6 @@ class BaseSerializer(WritableField):
for field_name, field in self.fields.items():
field.initialize(parent=self, field_name=field_name)
if isinstance(field, ModelSerializer) and self.object:
# Set the serializer object if it exists
pk_field_name = field.opts.model._meta.pk.name
obj = getattr(self.object, field_name)
nested_data = data.get(field_name)
pk_val = nested_data.get(pk_field_name) if nested_data else None
if obj and (getattr(obj, pk_field_name) == pk_val):
field.object = obj
field.delete = nested_data.get('_delete')
try:
field.field_from_native(data, files, field_name, reverted_data)
except ValidationError as err:
@ -393,6 +384,15 @@ class ModelSerializer(Serializer):
raise ValidationError(self.error_messages['required'])
return
if self.parent.object:
# Set the serializer object if it exists
pk_field_name = self.opts.model._meta.pk.name
pk_val = native.get(pk_field_name)
obj = getattr(self.parent.object, field_name)
if obj and (getattr(obj, pk_field_name) == pk_val):
self.object = obj
self.delete = native.get('_delete')
obj = self.from_native(native, files)
if not self._errors:
self.object = obj