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

Merge bbea7c42bc into fd72a814f8

Browse Source
This commit is contained in:
Guan Ke 2017-04-17 00:21:00 +00:00 committed by GitHub
commit fb1c45ed79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/relations.py
View File

@ -482,9 +482,9 @@ class ManyRelatedField(Field):
if self.field_name not in dictionary: if self.field_name not in dictionary:
if getattr(self.root, 'partial', False): if getattr(self.root, 'partial', False):
return empty return empty
return dictionary.getlist(self.field_name) return dictionary.getlist(self.field_name) or empty
return dictionary.get(self.field_name, empty) return dictionary.get(self.field_name, empty) or empty
def to_internal_value(self, data): def to_internal_value(self, data):
if isinstance(data, type('')) or not hasattr(data, '__iter__'): if isinstance(data, type('')) or not hasattr(data, '__iter__'):