fastadmin 0.1.16__tar.gz → 0.1.17__tar.gz

{fastadmin-0.1.16 → fastadmin-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastadmin
-Version: 0.1.16
+Version: 0.1.17
 Summary: 
 Home-page: https://github.com/vsdudakov/fastadmin
 License: MIT
@@ -39,6 +39,12 @@ Description-Content-Type: text/markdown
 ![List View](https://raw.githubusercontent.com/vsdudakov/fastadmin/main/docs/images/list.png)
 ![Change View](https://raw.githubusercontent.com/vsdudakov/fastadmin/main/docs/images/change.png)
 
+<p align="center">
+  <a href="https://twitter.com/intent/tweet?text=Admin%20Dashboard%20For%20FastAPI&url=https://github.com/vsdudakov/fastadmin&hashtags=FastAPI,AdminDashboard">
+    <img alt="tweet" src="https://img.shields.io/twitter/url/https/twitter?label=Share%20on%20twitter&style=social" target="_blank" />
+  </a>
+</p>
+
 ## Introduction
 
 FastAdmin is an easy-to-use Admin App for FastAPI inspired by Django Admin.

{fastadmin-0.1.16 → fastadmin-0.1.17}/README.md

@@ -12,6 +12,12 @@
 ![List View](https://raw.githubusercontent.com/vsdudakov/fastadmin/main/docs/images/list.png)
 ![Change View](https://raw.githubusercontent.com/vsdudakov/fastadmin/main/docs/images/change.png)
 
+<p align="center">
+  <a href="https://twitter.com/intent/tweet?text=Admin%20Dashboard%20For%20FastAPI&url=https://github.com/vsdudakov/fastadmin&hashtags=FastAPI,AdminDashboard">
+    <img alt="tweet" src="https://img.shields.io/twitter/url/https/twitter?label=Share%20on%20twitter&style=social" target="_blank" />
+  </a>
+</p>
+
 ## Introduction
 
 FastAdmin is an easy-to-use Admin App for FastAPI inspired by Django Admin.

{fastadmin-0.1.16 → fastadmin-0.1.17}/fastadmin/api/api.py

@@ -430,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-0.1.16 → fastadmin-0.1.17}/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-0.1.16 → fastadmin-0.1.17}/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-0.1.16 → fastadmin-0.1.17}/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