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

Moved get component from object after test source is star

Browse Source
This commit is contained in:
Vladislav Vlastovskiy 2014-03-20 01:50:40 +04:00
parent 19c03f4a60
commit c3aa10e589
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rest_framework/serializers.py
View File

@ -438,6 +438,10 @@ class BaseSerializer(WritableField):
raise ValidationError(self.error_messages['required']) raise ValidationError(self.error_messages['required'])
return return
else:
if value in (None, ''):
into[(self.source or field_name)] = None
else:
# Set the serializer object if it exists # Set the serializer object if it exists
obj = get_component(self.parent.object, self.source or field_name) if self.parent.object else None obj = get_component(self.parent.object, self.source or field_name) if self.parent.object else None
@ -453,10 +457,7 @@ class BaseSerializer(WritableField):
reverted_data = self.restore_fields(value, {}) reverted_data = self.restore_fields(value, {})
if not self._errors: if not self._errors:
into.update(reverted_data) into.update(reverted_data)
else:
if value in (None, ''):
into[(self.source or field_name)] = None
else:
kwargs = { kwargs = {
'instance': obj, 'instance': obj,
'data': value, 'data': value,