plain.admin 0.31.3__py3-none-any.whl → 0.31.5__py3-none-any.whl

plain/admin/README.md

@@ -150,6 +150,37 @@ TODO
 
 TODO
 
+## List `displays`
+
+On admin list views, you can define different `displays` to build predefined views of your data. The display choices will be shown in the UI, and you can use the current `self.display` in your view.
+
+```python
+# app/users/admin.py
+from plain.admin.views import AdminModelListView, register_viewset
+
+from .models import User
+
+
+@register_viewset
+class UserAdmin(AdminViewset):
+    class ListView(AdminModelListView):
+        model = User
+        fields = [
+            "id",
+            "email",
+            "created_at__date",
+        ]
+        displays = ["Users without email"]
+
+        def get_objects(self):
+            objects = super().get_objects()
+
+            if self.display == "Users without email":
+                objects = objects.filter(email="")
+
+            return objects
+```
+
 ## Toolbar
 
 TODO

plain/admin/templates/admin/list.html

@@ -41,7 +41,7 @@
         <form method="GET" class="inline-flex space-x-5">
             {% if displays %}
             <select data-autosubmit name="display" class="text-sm">
-                <option value="">Displays</option>
+                <option value="">Choose a display</option>
                 {% for display in displays %}
                 <option {% if display == current_display %}selected{% endif %}>{{ display }}</option>
                 {% endfor %}
@@ -89,9 +89,9 @@
                         {% else %}
                         <a
                             data-merge-params
-                            class="font-mono text-xs font-normal"
+                            class="font-mono text-xs font-normal flex space-x-1 items-center"
                             href="?page=1&order_by={{ '-' if not order_by_direction else '' }}{{ field }}">
-                            {{ field }}
+                            <span>{{ field }}</span>
                             {% if field == order_by_field %}
                             {% if order_by_direction == "-" %}
                             <span class="text-xs">▲</span>

plain/admin/views/models.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING
 
 from plain import models
+from plain.exceptions import FieldError
 from plain.models import Manager, Q
 
 from .objects import (
@@ -92,8 +93,8 @@ class AdminModelListView(AdminListView):
 
     def get_objects(self):
         queryset = self.get_initial_queryset()
-        queryset = self.order_queryset(queryset)
         queryset = self.search_queryset(queryset)
+        queryset = self.order_queryset(queryset)
         return queryset
 
     def get_initial_queryset(self):
@@ -103,7 +104,23 @@ class AdminModelListView(AdminListView):
 
     def order_queryset(self, queryset):
         if order_by := self.request.query_params.get("order_by"):
-            queryset = queryset.order_by(order_by)
+            try:
+                queryset = queryset.order_by(order_by)
+            except FieldError:
+                # Fallback to sorting in Python if the field is not valid
+                # Note this can be an expensive operation!
+                if order_by.startswith("-"):
+                    queryset = sorted(
+                        queryset,
+                        key=lambda obj: self.get_field_value(obj, order_by[1:]),
+                        reverse=False,
+                    )
+                else:
+                    queryset = sorted(
+                        queryset,
+                        key=lambda obj: self.get_field_value(obj, order_by),
+                        reverse=True,
+                    )
         elif self.queryset_order:
             queryset = queryset.order_by(*self.queryset_order)
 

{plain_admin-0.31.3.dist-info → plain_admin-0.31.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.31.3
+Version: 0.31.5
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
@@ -165,6 +165,37 @@ TODO
 
 TODO
 
+## List `displays`
+
+On admin list views, you can define different `displays` to build predefined views of your data. The display choices will be shown in the UI, and you can use the current `self.display` in your view.
+
+```python
+# app/users/admin.py
+from plain.admin.views import AdminModelListView, register_viewset
+
+from .models import User
+
+
+@register_viewset
+class UserAdmin(AdminViewset):
+    class ListView(AdminModelListView):
+        model = User
+        fields = [
+            "id",
+            "email",
+            "created_at__date",
+        ]
+        displays = ["Users without email"]
+
+        def get_objects(self):
+            objects = super().get_objects()
+
+            if self.display == "Users without email":
+                objects = objects.filter(email="")
+
+            return objects
+```
+
 ## Toolbar
 
 TODO

{plain_admin-0.31.3.dist-info → plain_admin-0.31.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-plain/admin/README.md,sha256=Ro2YkrKS-RXsmFBFN0QUpLh4OHIDvMkVgDIE6Wu4PMQ,3800
+plain/admin/README.md,sha256=w5N8yhHdMgY2RIf4WUvIXKvBrRTHLy4CV0ROtdK2Jiw,4614
 plain/admin/__init__.py,sha256=bPv9iftT8aLqBH6dDy-HTVXW66dQUhfIiEZ-LIUMC0Y,78
 plain/admin/config.py,sha256=TDYmJe4UYmKw4bz0x5s9PkDa-X4V-9JoJlka162-J7M,676
 plain/admin/dates.py,sha256=EEhcQhHt3-k6kE9yvPdH5X6EecmUQ259xywbDBec3Dg,10253
@@ -37,7 +37,7 @@ plain/admin/templates/admin/base.html,sha256=urUvdcgcZZWjevZSvkagXdcrUe5LYUeaWme
 plain/admin/templates/admin/delete.html,sha256=lNuU2G-BR6TH6NUmh7VcvjnEuFeI84rwwk_oO1jkUq0,431
 plain/admin/templates/admin/detail.html,sha256=AizpXs6HguFzwbk7JDbH8poJB5dM2CaVVaQ4FThAHaw,730
 plain/admin/templates/admin/index.html,sha256=b65tcZhv9QfvmjePySU7MmzUlpMECIXP8dBH-a3Eyxw,69
-plain/admin/templates/admin/list.html,sha256=tD3CVXl8ghBVavF5_8WG_ekj96FeKt_iq97j35zPkZI,8609
+plain/admin/templates/admin/list.html,sha256=lFqZoZYQXbEfadYI9sgI0KoTkAxD9DR9eNo30madV0o,8658
 plain/admin/templates/admin/page.html,sha256=wzRR-JLs8CgCOoB3BMoYWqTMpYM0z4X2qlqdwAe0YjM,67
 plain/admin/templates/admin/search.html,sha256=zfwnXoztAFnj8OmwxJcWaqo-SKCy50bLwfwSrAnAtoQ,1799
 plain/admin/templates/admin/cards/base.html,sha256=jNw61yM0R40roC8UqGWXFCegObSIV0rbvQ0021gzUi0,913
@@ -74,12 +74,12 @@ plain/admin/templates/toolbar/request.html,sha256=VyxNpEISVYZtGkR4J0XiXkv8d3Ltic
 plain/admin/templates/toolbar/toolbar.html,sha256=Gow_2-ITxtbkGLgJRRjL169E9TaTKMfsZ26A9g36gkw,6833
 plain/admin/views/__init__.py,sha256=nF6AENZ3Xxyi08OTRrF6e-HYBkZSFj7XBK2mVzMYqN4,846
 plain/admin/views/base.py,sha256=S1oaMUXnMOwRozbn2K-tk9tL4BMimemfMagZD9QxrJw,3512
-plain/admin/views/models.py,sha256=DAv7YzeSyQHLLAVdUhSPCkmx2B10g5ksAjHm2jrgQfw,5973
+plain/admin/views/models.py,sha256=Ckck8_OAnQ7vvqAa5L65-KmeetAUMJAlLLnKiEK72PM,6690
 plain/admin/views/objects.py,sha256=eKL8A2B1ZMgTrCbTXnh6vCeju_HObxwetn_xc1vYlfY,11176
 plain/admin/views/registry.py,sha256=Lxib4YSQCMHb_zACnLKymJakV8jCZPWYll7J8-aV9Xw,3712
 plain/admin/views/types.py,sha256=ONMMdUoapgMoUVYgSIe-4YCdfvaVMQ4jgPWYiMo0pDk,178
 plain/admin/views/viewsets.py,sha256=dqMlQ6kLn9iqd9BwBWAZT1S271wH1FdfM5HXbOgBMEw,1655
-plain_admin-0.31.3.dist-info/METADATA,sha256=brYep_VwA1Y3LG2kMMzWG9i7XCuSyf5hgmF-pCa6ZQo,4237
-plain_admin-0.31.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_admin-0.31.3.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
-plain_admin-0.31.3.dist-info/RECORD,,
+plain_admin-0.31.5.dist-info/METADATA,sha256=lSvGvyodAkxgrKZ4IWNV7WRC3y7poyzHVzqTLIWSmjg,5051
+plain_admin-0.31.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_admin-0.31.5.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
+plain_admin-0.31.5.dist-info/RECORD,,