fastadmin 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

fastadmin/api/api.py

@@ -370,7 +370,7 @@ async def configuration(
                 ),
             )
 
-        for field_name in admin_obj.list_display:
+        for column_index, field_name in enumerate(admin_obj.list_display):
             display_field_function = getattr(admin_obj, field_name, None)
             if (
                 not display_field_function
@@ -379,15 +379,12 @@ async def configuration(
             ):
                 continue
 
-            column_index = admin_obj.list_display.index(field_name) if field_name in admin_obj.list_display else None
-            if column_index is None:
-                continue
             fields_schema.append(
                 ModelFieldSchema(
                     name=field_name,
                     list_configuration=ListConfigurationFieldSchema(
                         index=column_index,
-                        sorter=None,
+                        sorter=False,
                         is_link=field_name in admin_obj.list_display_links,
                         empty_value_display=admin_obj.empty_value_display,
                         filter_widget_type=None,
@@ -433,6 +430,7 @@ async def configuration(
                 actions_on_bottom=admin_obj.actions_on_bottom,
                 actions_selection_counter=admin_obj.actions_selection_counter,
                 fields=fields_schema,
+                fieldsets=admin_obj.fieldsets,
                 list_per_page=admin_obj.list_per_page,
                 save_on_top=admin_obj.save_on_top,
                 save_as=admin_obj.save_as,

fastadmin/models/base.py

@@ -420,18 +420,21 @@ class BaseModelAdmin:
 
         :return: A list of model field names.
         """
-        fields = self.fields
         model_fields = self.get_model_fields()
-        if not fields:
-            return [f for f in model_fields if not self.exclude or f not in self.exclude]
-        return [f for f in fields if f in model_fields]
 
-    # def get_fieldsets(self) -> Sequence[tuple[str | None, dict[str, Sequence[str]]]]:
-    #     """This method is used to get fieldsets data for form view.
-
-    #     :return: A list of fieldsets data.
-    #     """
-    #     return self.fieldsets
+        fields = [f for f in model_fields if model_fields[f].get("is_pk")]
+        if not self.fields:
+            if self.fieldsets:
+                for item in self.fieldsets:
+                    for field in item[1].get("fields") or []:
+                        if field not in fields and field not in self.exclude:
+                            fields.append(field)
+            else:
+                for field in model_fields:
+                    if field not in fields and field not in self.exclude:
+                        fields.append(field)
+
+        return fields
 
     def has_add_permission(self) -> bool:
         """This method is used to check if user has permission to add new model instance.

fastadmin/models/orm/tortoise.py

@@ -247,7 +247,7 @@ class TortoiseModelAdmin(BaseModelAdmin):
         widget_props = {
             "required": field.get("required") or False,
             "disabled": field_name in self.readonly_fields,
-            "readonly": field_name in self.readonly_fields,
+            "readOnly": field_name in self.readonly_fields,
         }
         match field.get("orm_class_name"):
             case "CharField":

fastadmin/schemas/configuration.py

@@ -92,6 +92,7 @@ class ModelSchema(BaseModel):
     actions_on_bottom: bool | None
     actions_selection_counter: bool | None
     fields: Sequence[ModelFieldSchema]
+    fieldsets: Sequence[tuple[str | None, dict[str, Sequence[str]]]] | None
     list_per_page: int | None
     save_on_top: bool | None
     save_as: bool | None