encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-20 13:33:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2857 from w-/patch-3

Browse Source 
increase serializer compatibility to django 1.8
This commit is contained in:
Xavier Ordoquy 2015-05-04 15:56:58 +02:00
commit 9926241afb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/serializers.py
View File

@ -993,7 +993,11 @@ class ModelSerializer(Serializer):
m2m_data[field_name] = attrs.pop(field_name) m2m_data[field_name] = attrs.pop(field_name)
# Forward m2m relations # Forward m2m relations
for field in meta.many_to_many + meta.virtual_fields: if issubclass(meta.many_to_many.__class__, tuple):
temp_m2m = list(meta.many_to_many)
else:
temp_m2m = meta.many_to_many
for field in temp_m2m + meta.virtual_fields:
if isinstance(field, GenericForeignKey): if isinstance(field, GenericForeignKey):
continue continue
if field.name in attrs: if field.name in attrs: