fastadmin 0.2.10__py3-none-any.whl → 0.2.11__py3-none-any.whl

fastadmin/models/decorators.py

@@ -24,7 +24,8 @@ def action(function=None, *, description: str | None = None):
         return decorator(function)
 
 
-def display(function=None):
+# TODO: make the sorter parameter a string to specify how to sort the data
+def display(function=None, *, sorter: bool = False):
     """Conveniently add attributes to a display function:
 
     Example of usage:
@@ -33,10 +34,13 @@ def display(function=None):
         return obj.publish_date is not None
 
     :param function: A function to decorate.
+    :param sorter: Enable sorting or not. **WARNING**: supported only for Django and Tortoise.
+        Function name should be like an ORM ordering param, e.g. `def user__username(self, obj)`.
     """
 
     def decorator(func):
         func.is_display = True
+        func.sorter = sorter
         return func
 
     if function is None:

fastadmin/models/helpers.py

@@ -15,6 +15,21 @@ from fastadmin.models.schemas import (
     ModelSchema,
 )
 
+try:
+    from tortoise.models import Model as TortoiseModel
+except ImportError:
+
+    class TortoiseModel:  # type: ignore [no-redef]
+        pass
+
+
+try:
+    from django.db.models import Model as DjangoModel
+except ImportError:
+
+    class DjangoModel:  # type: ignore [no-redef]
+        pass
+
 
 def register_admin_model_class(admin_model_class: type[ModelAdmin], orm_model_classes: list[Any], **kwargs) -> None:
     """This method is used to register an admin model.
@@ -162,17 +177,24 @@ def generate_models_schema(
                 ),
             )
 
-        for column_index, field_name in enumerate(orm_model_fields_for_serialize):
+        for field_name in orm_model_fields_for_serialize:
             display_field_function = getattr(admin_model_obj, field_name, None)
             if not display_field_function or not hasattr(display_field_function, "is_display"):
                 continue
+            if field_name not in column_fields:
+                continue
+            column_index = column_fields.index(field_name)
+
+            sorter = getattr(display_field_function, "sorter", False)
+            if sorter and not issubclass(orm_model_cls, TortoiseModel | DjangoModel):
+                raise NotImplementedError("Sorter of custom columns is supported only for Tortoise or Django")
 
             fields_schema.append(
                 ModelFieldSchema(
                     name=field_name,
                     list_configuration=ListConfigurationFieldSchema(
                         index=column_index,
-                        sorter=False,
+                        sorter=sorter,
                         is_link=field_name in getattr(admin_model_obj, "list_display_links", ()),
                         empty_value_display=admin_model_obj.empty_value_display,
                         filter_widget_type=None,

fastadmin/models/orms/ponyorm.py

@@ -328,9 +328,12 @@ class PonyORMMixin:
         :params id: an id of object.
         :return: None.
         """
-        # delete(o for o in self.model_cls if getattr(o, self.get_model_pk_name(self.model_cls)) == id)
-        # flush()
-        # commit()
+        obj = next((i for i in self.model_cls.select(**{self.get_model_pk_name(self.model_cls): id})), None)
+        if not obj:
+            return
+        obj.delete()
+        flush()
+        commit()
 
     @sync_to_async
     @db_session
@@ -365,12 +368,12 @@ class PonyORMMixin:
         obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
         if not obj:
             return
-        obj.participants.clear()
+        getattr(obj, field).clear()
         if ids:
             rel_model_cls = getattr(self.model_cls, field).py_type
             rel_key_id = self.get_model_pk_name(rel_model_cls)
             rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
-            obj.participants.add(rel_objs)
+            getattr(obj, field).add(rel_objs)
         flush()
         commit()
 

{fastadmin-0.2.10.dist-info → fastadmin-0.2.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fastadmin
-Version: 0.2.10
+Version: 0.2.11
 Summary: FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin.
 Home-page: https://github.com/vsdudakov/fastadmin
 License: MIT

{fastadmin-0.2.10.dist-info → fastadmin-0.2.11.dist-info}/RECORD

@@ -21,11 +21,11 @@ fastadmin/api/schemas.py,sha256=5eYJDGrSrvy0YdB8vak0zPv-a51a36CYJ_RVA2vgTKU,1348
 fastadmin/api/service.py,sha256=RfDOFYknkwmaIhya_y_Zlv8MjWBwZqPMCTw7tZCoP8k,18032
 fastadmin/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastadmin/models/base.py,sha256=1KN0Wir7Bc-DtdpualxYnMzQq2JSBBrvpw2E22sBWfU,26728
-fastadmin/models/decorators.py,sha256=T1Dn1NTUEaFvsuV9EAEdBXODwVEFaQBSxdyicMvgwrU,2555
-fastadmin/models/helpers.py,sha256=gPgvjrR3wZaRC1gIc05Ah9tkgaxisgXjuLGvYXl4tY8,14117
+fastadmin/models/decorators.py,sha256=KtfUBoiDJGbUGVgw4LZS7YdgqlEzHvA1mhXynnJ3-jg,2877
+fastadmin/models/helpers.py,sha256=XngMU4kQex1r7k4qSIUdjaYiz-RPhE3HVDCegf5O7Io,14785
 fastadmin/models/orms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastadmin/models/orms/django.py,sha256=4SjnTptdLV1Yt013jsIZ4BQzmIRmJQEawaG-eY66n8Q,16185
-fastadmin/models/orms/ponyorm.py,sha256=v7JA8g5tGXb7uF2Q_kv5dk7gH2eVvvz7ngf7JCmN8hY,17836
+fastadmin/models/orms/ponyorm.py,sha256=ntYii23PTbYJjR0qQH9ZguFcBKHnG9Yx50-hSfUNEk8,17903
 fastadmin/models/orms/sqlalchemy.py,sha256=GpDnmM2g358sz1Pde1DZSFMLLSxUoZ4eHwJcwFjGEdc,18742
 fastadmin/models/orms/tortoise.py,sha256=q1vLLm3uQ677Xe4gIb3VaIMbm5USdEHLWF22TZaj914,15949
 fastadmin/models/schemas.py,sha256=KxPlsoLfbrHuSz2F5h_UV18hKjgbeDioxWMcitbIJhk,4306
@@ -37,7 +37,7 @@ fastadmin/static/index.html,sha256=J6YYi1W7Y-YHlAfdTjy4KOd_yMZy-UWMJZAFDe78eAI,6
 fastadmin/static/index.min.css,sha256=219cuKBCK38b4RsJ-jBdTzdJ7OmSBqMmZGfpYfCb9b0,69757
 fastadmin/static/index.min.js,sha256=_u-R1Gjy5-cbFgwyHu0CyeaMV5LK4I5iRJtWR0hdzdo,2976527
 fastadmin/templates/index.html,sha256=WHIAqNmtJ_fHMgYrMHkUwsYxt4Xo6yMrieDODKDCN9Q,719
-fastadmin-0.2.10.dist-info/LICENSE,sha256=-5Cmq6xd5DlFq8rhBcqGMi8Mlh_h-YVjKOYjnYk5dyM,1063
-fastadmin-0.2.10.dist-info/METADATA,sha256=Tkmybp3jZcstGZfhCmLYiffibD8oPJKvDlZ_nSqnzOg,11743
-fastadmin-0.2.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-fastadmin-0.2.10.dist-info/RECORD,,
+fastadmin-0.2.11.dist-info/LICENSE,sha256=-5Cmq6xd5DlFq8rhBcqGMi8Mlh_h-YVjKOYjnYk5dyM,1063
+fastadmin-0.2.11.dist-info/METADATA,sha256=-juFKRB-zCVRe2qn4SSw6QqXoBe5OVCJ-xk6s0kuy_4,11743
+fastadmin-0.2.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fastadmin-0.2.11.dist-info/RECORD,,