mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-06 21:33:34 +03:00
when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765
This commit is contained in:
parent
c992b600f7
commit
208bd991da
|
@ -378,6 +378,10 @@ class BaseSerializer(WritableField):
|
||||||
# Set the serializer object if it exists
|
# Set the serializer object if it exists
|
||||||
obj = getattr(self.parent.object, field_name) if self.parent.object else None
|
obj = getattr(self.parent.object, field_name) if self.parent.object else None
|
||||||
|
|
||||||
|
if self.source == '*':
|
||||||
|
if value:
|
||||||
|
into.update(value)
|
||||||
|
else:
|
||||||
if value in (None, ''):
|
if value in (None, ''):
|
||||||
into[(self.source or field_name)] = None
|
into[(self.source or field_name)] = None
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -78,6 +78,17 @@ class PersonSerializer(serializers.ModelSerializer):
|
||||||
read_only_fields = ('age',)
|
read_only_fields = ('age',)
|
||||||
|
|
||||||
|
|
||||||
|
class NestedSerializer(serializers.Serializer):
|
||||||
|
info = serializers.Field()
|
||||||
|
|
||||||
|
|
||||||
|
class ModelSerializerWithNestedSerializer(serializers.ModelSerializer):
|
||||||
|
nested = NestedSerializer(source='*')
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = Person
|
||||||
|
|
||||||
|
|
||||||
class PersonSerializerInvalidReadOnly(serializers.ModelSerializer):
|
class PersonSerializerInvalidReadOnly(serializers.ModelSerializer):
|
||||||
"""
|
"""
|
||||||
Testing for #652.
|
Testing for #652.
|
||||||
|
@ -369,6 +380,17 @@ class ValidationTests(TestCase):
|
||||||
except:
|
except:
|
||||||
self.fail('Wrong exception type thrown.')
|
self.fail('Wrong exception type thrown.')
|
||||||
|
|
||||||
|
def test_writable_star_source_on_nested_serializer(self):
|
||||||
|
"""
|
||||||
|
Assert that a nested serializer instantiated with source='*' correctly
|
||||||
|
expands the data into the outer serializer.
|
||||||
|
"""
|
||||||
|
serializer = ModelSerializerWithNestedSerializer(data={
|
||||||
|
'name': 'marko',
|
||||||
|
'nested': {'info': 'hi'}},
|
||||||
|
)
|
||||||
|
self.assertEqual(serializer.is_valid(), True)
|
||||||
|
|
||||||
|
|
||||||
class CustomValidationTests(TestCase):
|
class CustomValidationTests(TestCase):
|
||||||
class CommentSerializerWithFieldValidator(CommentSerializer):
|
class CommentSerializerWithFieldValidator(CommentSerializer):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user