Fixed DynamicFieldsModelSerializer

Author: zengqiu

README.md

@@ -162,6 +162,7 @@ Response:
 
 It's copied from [official document](https://www.django-rest-framework.org/api-guide/serializers/#dynamically-modifying-fields).
 
+When using `DynamicFieldsModelSerializer`, the settings in `Meta` such as `exclude` and `fields` are ignored. Instead, the `fields` specified in the parameter that is passed in will take precedence.
 
 # Mixins
 

rest_framework_ext/serializers.py

@@ -63,12 +63,24 @@ def __init__(self, *args, **kwargs):
         # Don't pass the 'fields' arg up to the superclass
         fields = kwargs.pop('fields', None)
 
-        # Instantiate the superclass normally
-        super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs)
+        if fields:
+            if hasattr(self.Meta, 'exclude'):
+                delattr(self.Meta, 'exclude')
+
+            model = getattr(self.Meta, 'model')
+            property_fields = {name for name in dir(model) if isinstance(getattr(model, name), property)}
+
+            self.Meta.fields = list(
+                set([field.name for field in model._meta._get_fields(reverse=False)]) |
+                property_fields |
+                set(self._declared_fields)
+            )
 
-        if fields is not None:
             # Drop any fields that are not specified in the `fields` argument.
             allowed = set(fields)
             existing = set(self.fields)
             for field_name in existing - allowed:
                 self.fields.pop(field_name)
+
+        # Instantiate the superclass normally
+        super(DynamicFieldsModelSerializer, self).__init__(*args, **kwargs)

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='djangorestframework-ext',
-    version='0.18',
+    version='0.19',
     url='https://github.com/zengqiu/django-rest-framework-ext',
     license='MIT',
     author='zengqiu',