plain.admin 0.23.0__tar.gz → 0.25.0__tar.gz

{plain_admin-0.23.0 → plain_admin-0.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.23.0
+Version: 0.25.0
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
@@ -24,7 +24,7 @@ in addition to models.
 
 - cards
 - dashboards
-- diy forms
+- diy forms - have to install elements if you want to use them (or an app uses them, or maybe plain pkgs should use them just for admin...)
 - detached from login (do your own login (oauth, passkeys, etc))
 
 ## Installation

{plain_admin-0.23.0 → plain_admin-0.25.0}/plain/admin/README.md

@@ -9,7 +9,7 @@ in addition to models.
 
 - cards
 - dashboards
-- diy forms
+- diy forms - have to install elements if you want to use them (or an app uses them, or maybe plain pkgs should use them just for admin...)
 - detached from login (do your own login (oauth, passkeys, etc))
 
 ## Installation

{plain_admin-0.23.0 → plain_admin-0.25.0}/plain/admin/assets/admin/admin.js

@@ -58,8 +58,13 @@ jQuery(function($) {
                 // Column already has a link, so don't add another
                 return;
             }
+            var autolinkUrl = $this.data("column-autolink");
+            if (!autolinkUrl) {
+                // No URL, so don't add a link
+                return;
+            }
             var $link = $(document.createElement("a"));
-            $link.attr("href", $this.data("column-autolink"));
+            $link.attr("href", autolinkUrl);
             $link.addClass("flex p-2 -m-2 text-white/80 hover:no-underline");
             $(this).wrapInner($link);
         })

{plain_admin-0.23.0 → plain_admin-0.25.0}/plain/admin/views/models.py

@@ -162,17 +162,6 @@ class AdminModelDetailView(AdminDetailView):
     def get_object(self):
         return self.model.objects.get(pk=self.url_kwargs["pk"])
 
-    def get_template_names(self) -> list[str]:
-        template_names = super().get_template_names()
-
-        if not self.template_name and isinstance(self.object, models.Model):
-            object_meta = self.object._meta
-            template_names = [
-                f"admin/{object_meta.package_label}/{object_meta.model_name}{self.template_name_suffix}.html"
-            ] + template_names
-
-        return template_names
-
 
 class AdminModelCreateView(AdminCreateView):
     model: "models.Model"
@@ -191,17 +180,6 @@ class AdminModelCreateView(AdminCreateView):
 
         return f"{cls.model._meta.model_name}/create/"
 
-    def get_template_names(self):
-        template_names = super().get_template_names()
-
-        if not self.template_name and issubclass(self.model, models.Model):
-            model_meta = self.model._meta
-            template_names = [
-                f"admin/{model_meta.package_label}/{model_meta.model_name}{self.template_name_suffix}.html"
-            ] + template_names
-
-        return template_names
-
 
 class AdminModelUpdateView(AdminUpdateView):
     model: "models.Model"
@@ -224,17 +202,6 @@ class AdminModelUpdateView(AdminUpdateView):
     def get_object(self):
         return self.model.objects.get(pk=self.url_kwargs["pk"])
 
-    def get_template_names(self):
-        template_names = super().get_template_names()
-
-        if not self.template_name and isinstance(self.object, models.Model):
-            object_meta = self.object._meta
-            template_names = [
-                f"admin/{object_meta.package_label}/{object_meta.model_name}{self.template_name_suffix}.html"
-            ] + template_names
-
-        return template_names
-
 
 class AdminModelDeleteView(AdminDeleteView):
     model: "models.Model"

{plain_admin-0.23.0 → plain_admin-0.25.0}/plain/admin/views/objects.py

@@ -72,7 +72,7 @@ class AdminListView(HTMXViewMixin, AdminView):
 
         if self.is_htmx_request() and not hx_from_this_page and not self._page:
             # Don't render anything
-            return Response(status=204)
+            return Response(status_code=204)
 
         return response
 
@@ -144,29 +144,29 @@ class AdminListView(HTMXViewMixin, AdminView):
             "admin/values/default.html",
         ]
 
-    def get_list_url(self) -> str | None:
-        return None
+    def get_list_url(self) -> str:
+        return ""
 
-    def get_create_url(self) -> str | None:
-        return None
+    def get_create_url(self) -> str:
+        return ""
 
-    def get_detail_url(self, obj) -> str | None:
-        return None
+    def get_detail_url(self, obj) -> str:
+        return ""
 
-    def get_update_url(self, obj) -> str | None:
-        return None
+    def get_update_url(self, obj) -> str:
+        return ""
 
-    def get_delete_url(self, obj) -> str | None:
-        return None
+    def get_delete_url(self, obj) -> str:
+        return ""
 
-    def get_object_url(self, obj) -> str | None:
+    def get_object_url(self, obj) -> str:
         if url := self.get_detail_url(obj):
             return url
         if url := self.get_update_url(obj):
             return url
         if url := self.get_delete_url(obj):
             return url
-        return None
+        return ""
 
     def get_object_links(self, obj) -> dict[str]:
         links = {}
@@ -191,20 +191,20 @@ class AdminListView(HTMXViewMixin, AdminView):
 class AdminCreateView(AdminView, CreateView):
     template_name = None
 
-    def get_list_url(self) -> str | None:
-        return None
+    def get_list_url(self) -> str:
+        return ""
 
-    def get_create_url(self) -> str | None:
-        return None
+    def get_create_url(self) -> str:
+        return ""
 
-    def get_detail_url(self, obj) -> str | None:
-        return None
+    def get_detail_url(self, obj) -> str:
+        return ""
 
-    def get_update_url(self, obj) -> str | None:
-        return None
+    def get_update_url(self, obj) -> str:
+        return ""
 
-    def get_delete_url(self, obj) -> str | None:
-        return None
+    def get_delete_url(self, obj) -> str:
+        return ""
 
     def get_success_url(self, form):
         if list_url := self.get_list_url():
@@ -227,7 +227,7 @@ class AdminDetailView(AdminView, DetailView):
 
     def get_template_names(self) -> list[str]:
         return super().get_template_names() + [
-            "admin/detail.html",
+            "admin/detail.html",  # A generic detail view for rendering any object
         ]
 
     def get_description(self):
@@ -274,20 +274,20 @@ class AdminDetailView(AdminView, DetailView):
 
         return templates
 
-    def get_list_url(self) -> str | None:
-        return None
+    def get_list_url(self) -> str:
+        return ""
 
-    def get_create_url(self) -> str | None:
-        return None
+    def get_create_url(self) -> str:
+        return ""
 
-    def get_detail_url(self, obj) -> str | None:
-        return None
+    def get_detail_url(self, obj) -> str:
+        return ""
 
-    def get_update_url(self, obj) -> str | None:
-        return None
+    def get_update_url(self, obj) -> str:
+        return ""
 
-    def get_delete_url(self, obj) -> str | None:
-        return None
+    def get_delete_url(self, obj) -> str:
+        return ""
 
     def get_fields(self):
         return self.fields.copy()  # Avoid mutating the class attribute itself
@@ -311,20 +311,20 @@ class AdminUpdateView(AdminView, UpdateView):
     template_name = None
     nav_section = ""
 
-    def get_list_url(self) -> str | None:
-        return None
+    def get_list_url(self) -> str:
+        return ""
 
-    def get_create_url(self) -> str | None:
-        return None
+    def get_create_url(self) -> str:
+        return ""
 
-    def get_detail_url(self, obj) -> str | None:
-        return None
+    def get_detail_url(self, obj) -> str:
+        return ""
 
-    def get_update_url(self, obj) -> str | None:
-        return None
+    def get_update_url(self, obj) -> str:
+        return ""
 
-    def get_delete_url(self, obj) -> str | None:
-        return None
+    def get_delete_url(self, obj) -> str:
+        return ""
 
     def get_description(self):
         return repr(self.object)
@@ -363,20 +363,20 @@ class AdminDeleteView(AdminView, DeleteView):
     def get_description(self):
         return repr(self.object)
 
-    def get_list_url(self) -> str | None:
-        return None
+    def get_list_url(self) -> str:
+        return ""
 
-    def get_create_url(self) -> str | None:
-        return None
+    def get_create_url(self) -> str:
+        return ""
 
-    def get_detail_url(self, obj) -> str | None:
-        return None
+    def get_detail_url(self, obj) -> str:
+        return ""
 
-    def get_update_url(self, obj) -> str | None:
-        return None
+    def get_update_url(self, obj) -> str:
+        return ""
 
-    def get_delete_url(self, obj) -> str | None:
-        return None
+    def get_delete_url(self, obj) -> str:
+        return ""
 
     def get_links(self):
         links = super().get_links()

{plain_admin-0.23.0 → plain_admin-0.25.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.admin"
-version = "0.23.0"
+version = "0.25.0"
 description = "Admin dashboard and tools for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"