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

Merge eee582af41 into 836e49b535

Browse Source
This commit is contained in:
j0hnsmith 2017-06-06 15:24:10 +00:00 committed by GitHub
commit d2e7617a1f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/serializers.py
View File

@ -1039,7 +1039,7 @@ class ModelSerializer(Serializer):
set of fields, but also takes into account the `Meta.fields` or set of fields, but also takes into account the `Meta.fields` or
`Meta.exclude` options if they have been specified. `Meta.exclude` options if they have been specified.
""" """
fields = getattr(self.Meta, 'fields', None) fields = getattr(self.Meta, 'fields', getattr(self.Meta, 'include', None))
exclude = getattr(self.Meta, 'exclude', None) exclude = getattr(self.Meta, 'exclude', None)
if fields and fields != ALL_FIELDS and not isinstance(fields, (list, tuple)): if fields and fields != ALL_FIELDS and not isinstance(fields, (list, tuple)):