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

Remove nested associations before adding new ones, to avoid collisions

Browse Source
This commit is contained in:
Mjumbe Wawatu Ukweli 2014-09-24 13:14:14 -04:00
parent 8c5fbfd088
commit 8a04d6e9fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/serializers.py
View File

@ -587,10 +587,10 @@ class BaseSerializer(WritableField):
self._data = None self._data = None
if isinstance(self.object, list): if isinstance(self.object, list):
[self.save_object(item, **kwargs) for item in self.object]
if self.object._deleted: if self.object._deleted:
[self.delete_object(item) for item in self.object._deleted] [self.delete_object(item) for item in self.object._deleted]
[self.save_object(item, **kwargs) for item in self.object]
else: else:
self.save_object(self.object, **kwargs) self.save_object(self.object, **kwargs)
@ -1049,16 +1049,16 @@ class ModelSerializer(Serializer):
]) ])
for accessor_name, related in obj._related_data.items(): for accessor_name, related in obj._related_data.items():
if isinstance(related, RelationsList): if isinstance(related, RelationsList):
# Delete any removed objects
if related._deleted:
[self.delete_object(item) for item in related._deleted]
# Nested reverse fk relationship # Nested reverse fk relationship
for related_item in related: for related_item in related:
fk_field = related_fields[accessor_name].field.name fk_field = related_fields[accessor_name].field.name
setattr(related_item, fk_field, obj) setattr(related_item, fk_field, obj)
self.save_object(related_item) self.save_object(related_item)
# Delete any removed objects
if related._deleted:
[self.delete_object(item) for item in related._deleted]
elif isinstance(related, models.Model): elif isinstance(related, models.Model):
# Nested reverse one-one relationship # Nested reverse one-one relationship
fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name