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

Allow nested write of non-relational fields

Browse Source
This commit is contained in:
Cristi Vîjdea 2019-06-13 20:01:33 +03:00 committed by Konstantinos Tselepakis
parent 89ac0a1c7e
commit bc5955f031
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/serializers.py
View File

@ -773,7 +773,7 @@ class ListSerializer(BaseSerializer):
# ModelSerializer & HyperlinkedModelSerializer # ModelSerializer & HyperlinkedModelSerializer
# -------------------------------------------- # --------------------------------------------
def raise_errors_on_nested_writes(method_name, serializer, validated_data): def raise_errors_on_nested_writes(method_name, serializer, validated_data, model_field_info):
""" """
Give explicit errors when users attempt to pass writable nested data. Give explicit errors when users attempt to pass writable nested data.
@ -800,6 +800,7 @@ def raise_errors_on_nested_writes(method_name, serializer, validated_data):
assert not any( assert not any(
isinstance(field, BaseSerializer) and isinstance(field, BaseSerializer) and
(field.source in validated_data) and (field.source in validated_data) and
(field.source in model_field_info.relations) and
isinstance(validated_data[field.source], (list, dict)) isinstance(validated_data[field.source], (list, dict))
for field in serializer._writable_fields for field in serializer._writable_fields
), ( ), (
@ -915,14 +916,14 @@ class ModelSerializer(Serializer):
If you want to support writable nested relationships you'll need If you want to support writable nested relationships you'll need
to write an explicit `.create()` method. to write an explicit `.create()` method.
""" """
raise_errors_on_nested_writes('create', self, validated_data)
ModelClass = self.Meta.model ModelClass = self.Meta.model
info = model_meta.get_field_info(ModelClass)
raise_errors_on_nested_writes('create', self, validated_data, info)
# Remove many-to-many relationships from validated_data. # Remove many-to-many relationships from validated_data.
# They are not valid arguments to the default `.create()` method, # They are not valid arguments to the default `.create()` method,
# as they require that the instance has already been saved. # as they require that the instance has already been saved.
info = model_meta.get_field_info(ModelClass)
many_to_many = {} many_to_many = {}
for field_name, relation_info in info.relations.items(): for field_name, relation_info in info.relations.items():
if relation_info.to_many and (field_name in validated_data): if relation_info.to_many and (field_name in validated_data):
@ -959,8 +960,8 @@ class ModelSerializer(Serializer):
return instance return instance
def update(self, instance, validated_data): def update(self, instance, validated_data):
raise_errors_on_nested_writes('update', self, validated_data)
info = model_meta.get_field_info(instance) info = model_meta.get_field_info(instance)
raise_errors_on_nested_writes('update', self, validated_data, info)
# Simply set each attribute on the instance, and then save it. # Simply set each attribute on the instance, and then save it.
# Note that unlike `.create()` we don't need to treat many-to-many # Note that unlike `.create()` we don't need to treat many-to-many