Fixed bug with fields on form

Author: vsdudakov

fastadmin/models/base.py

@@ -268,11 +268,12 @@ def get_fields_for_serialize(self) -> set[str]:
         """
         fields = self.get_model_fields_with_widget_types()
         fields_for_serialize = {field.name for field in fields}
+        if self.fields:
+            fields_for_serialize &= set(self.fields)
         if self.exclude:
             fields_for_serialize -= set(self.exclude)
-        include_fields = set(self.fields) | set(self.list_display)
-        if include_fields:
-            fields_for_serialize &= include_fields
+        if self.list_display:
+            fields_for_serialize |= set(self.list_display)
         return fields_for_serialize
 
     async def serialize_obj_attributes(

tests/models/test_base.py

@@ -1,6 +1,7 @@
 import pytest
 
 from fastadmin import ModelAdmin
+from fastadmin.models.schemas import ModelFieldWidgetSchema, WidgetType
 
 
 async def test_not_implemented_methods():
@@ -42,6 +43,60 @@ class Model:
 
     base = ModelAdmin(Model)
 
+    mocker.patch.object(base, "get_model_fields_with_widget_types", return_value=[])
+    assert not base.get_fields_for_serialize()
+
+    values = [
+        ModelFieldWidgetSchema(
+            name=f"test_{index}",
+            column_name=f"test_{index}",
+            is_m2m=False,
+            is_pk=False,
+            is_immutable=False,
+            form_widget_type=WidgetType.Input,
+            form_widget_props={},
+            filter_widget_type=WidgetType.Input,
+            filter_widget_props={},
+        )
+        for index in range(3)
+    ]
+    mocker.patch.object(base, "get_model_fields_with_widget_types", return_value=values)
+    fields = base.get_fields_for_serialize()
+    assert len(fields) == 3
+    assert "test_0" in base.get_fields_for_serialize()
+
+    base.exclude = ("test_0",)
+    fields = base.get_fields_for_serialize()
+    assert len(fields) == 2
+    assert "test_0" not in base.get_fields_for_serialize()
+
+    base.fields = ("test_0",)
+    base.exclude = ("test_0",)
+    fields = base.get_fields_for_serialize()
+    assert len(fields) == 0
+    assert "test_0" not in base.get_fields_for_serialize()
+
+    base.fields = ("test_0",)
+    base.exclude = ()
+    fields = base.get_fields_for_serialize()
+    assert len(fields) == 1
+    assert "test_0" in base.get_fields_for_serialize()
+
+    base.fields = ("test_0",)
+    base.list_display = ("test_1",)
+    base.exclude = ()
+    fields = base.get_fields_for_serialize()
+    assert len(fields) == 2
+    assert "test_0" in base.get_fields_for_serialize()
+    assert "test_1" in base.get_fields_for_serialize()
+
+
+async def test_get_fields_for_serialize(mocker):
+    class Model:
+        pass
+
+    base = ModelAdmin(Model)
+
     mocker.patch.object(base, "orm_get_list", return_value=([], 0))
     mocker.patch.object(base, "get_model_fields_with_widget_types", return_value=[])
     await base.get_export("wrong_format") is None