plain.admin 0.18.0__tar.gz → 0.19.1__tar.gz

{plain_admin-0.18.0 → plain_admin-0.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.admin
-Version: 0.18.0
+Version: 0.19.1
 Summary: Admin dashboard and tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/cards/base.py

@@ -2,7 +2,6 @@ from enum import Enum
 
 from plain.http import HttpRequest
 from plain.templates import Template
-from plain.utils.text import slugify
 from plain.views import View
 
 
@@ -22,7 +21,6 @@ class Card:
     title: str
 
     # Optional fields
-    slug: str = ""
     description: str = ""
     text: str = ""
     link: str = ""
@@ -60,8 +58,9 @@ class Card:
     def get_title(self) -> str:
         return self.title
 
-    def get_slug(self) -> str:
-        return self.slug or slugify(self.title)
+    @classmethod
+    def get_slug(cls) -> str:
+        return f"{cls.__module__}.{cls.__name__}".lower().replace(".", "_")
 
     def get_description(self) -> str:
         return self.description

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/templates/admin/base.html

@@ -78,7 +78,7 @@
                     {% for view in views %}
                     {% set url = view.get_view_url() %}
                     <a
-                        {% if url == request.path %}data-active{% endif %}
+                        {% if url == request.path or view in parent_view_classes %}data-active{% endif %}
                         class="data-[active]:bg-white/20 data-[active]:text-white flex items-center px-2 py-1 mt-px -mx-2 text-sm rounded hover:text-stone-300 text-stone-400/80 hover:bg-white/5"
                         href="{{ url }}">
                         {{ view.get_nav_title() }}

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/templates/elements/admin/Textarea.html

@@ -3,5 +3,6 @@
     name="{{ field.html_name }}"
     class="block w-full text-sm border rounded border-white/10 bg-white/5"
     rows="{{ rows|default(3) }}"
+    spellcheck="{{ spellcheck|default('default') }}"
     {% if field.field.required %}required{% endif %}
     >{{ field.value() or "" }}</textarea>

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/urls.py

@@ -10,7 +10,6 @@ from .views.registry import registry
 class AdminIndexView(AdminView):
     template_name = "admin/index.html"
     title = "Dashboard"
-    slug = ""
 
     def get(self):
         # Slight hack to redirect to the first view that doesn't
@@ -24,7 +23,6 @@ class AdminIndexView(AdminView):
 class AdminSearchView(AdminView):
     template_name = "admin/search.html"
     title = "Search"
-    slug = "search"
 
     def get_template_context(self):
         context = super().get_template_context()

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/views/base.py

@@ -3,7 +3,6 @@ from typing import TYPE_CHECKING
 from plain.auth.views import AuthViewMixin
 from plain.urls import reverse
 from plain.utils import timezone
-from plain.utils.text import slugify
 from plain.views import (
     TemplateView,
 )
@@ -22,7 +21,6 @@ class AdminView(AuthViewMixin, TemplateView):
     admin_required = True
 
     title: str = ""
-    slug: str = ""
     path: str = ""
     description: str = ""
     image: Img | None = None
@@ -69,15 +67,7 @@ class AdminView(AuthViewMixin, TemplateView):
 
     @classmethod
     def get_slug(cls) -> str:
-        if cls.slug:
-            return cls.slug
-
-        if cls.title:
-            return slugify(cls.title)
-
-        raise NotImplementedError(
-            f"Please set a slug on the {cls} class or implement get_slug()."
-        )
+        return f"{cls.__module__}.{cls.__qualname__}".lower().replace(".", "_")
 
     # Can actually use @classmethod, @staticmethod or regular method for these?
     def get_title(self) -> str:
@@ -91,15 +81,7 @@ class AdminView(AuthViewMixin, TemplateView):
 
     @classmethod
     def get_path(cls) -> str:
-        if cls.path:
-            return cls.path
-
-        if slug := cls.get_slug():
-            return slug
-
-        raise NotImplementedError(
-            f"Please set a path on the {cls} class or implement get_slug() or get_path()."
-        )
+        return cls.path
 
     @classmethod
     def get_parent_view_classes(cls) -> list["AdminView"]:

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/views/models.py

@@ -68,8 +68,11 @@ class AdminModelListView(AdminListView):
         return cls.model._meta.model_name.capitalize() + "s"
 
     @classmethod
-    def get_slug(cls) -> str:
-        return cls.model._meta.model_name
+    def get_path(cls) -> str:
+        if path := super().get_path():
+            return path
+
+        return f"{cls.model._meta.model_name}/"
 
     def get_template_context(self):
         context = super().get_template_context()
@@ -137,12 +140,11 @@ class AdminModelDetailView(AdminDetailView):
     def get_title(self) -> str:
         return str(self.object)
 
-    @classmethod
-    def get_slug(cls) -> str:
-        return f"{cls.model._meta.model_name}_detail"
-
     @classmethod
     def get_path(cls) -> str:
+        if path := super().get_path():
+            return path
+
         return f"{cls.model._meta.model_name}/<int:pk>/"
 
     def get_fields(self):
@@ -182,12 +184,11 @@ class AdminModelCreateView(AdminCreateView):
 
         return f"New {self.model._meta.model_name}"
 
-    @classmethod
-    def get_slug(cls) -> str:
-        return f"{cls.model._meta.model_name}_create"
-
     @classmethod
     def get_path(cls) -> str:
+        if path := super().get_path():
+            return path
+
         return f"{cls.model._meta.model_name}/create/"
 
     def get_template_names(self):
@@ -213,12 +214,11 @@ class AdminModelUpdateView(AdminUpdateView):
 
         return f"Update {self.object}"
 
-    @classmethod
-    def get_slug(cls) -> str:
-        return f"{cls.model._meta.model_name}_update"
-
     @classmethod
     def get_path(cls) -> str:
+        if path := super().get_path():
+            return path
+
         return f"{cls.model._meta.model_name}/<int:pk>/update/"
 
     def get_object(self):
@@ -242,12 +242,11 @@ class AdminModelDeleteView(AdminDeleteView):
     def get_title(self) -> str:
         return f"Delete {self.object}"
 
-    @classmethod
-    def get_slug(cls) -> str:
-        return f"{cls.model._meta.model_name}_delete"
-
     @classmethod
     def get_path(cls) -> str:
+        if path := super().get_path():
+            return path
+
         return f"{cls.model._meta.model_name}/<int:pk>/delete/"
 
     def get_object(self):

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/views/registry.py

@@ -67,18 +67,26 @@ class AdminViewRegistry:
     def get_urls(self):
         urls = []
 
-        paths_seen = set()
-
-        def add_view_path(view, _path):
-            if _path in paths_seen:
-                raise ValueError(f"Path {_path} already registered")
-            paths_seen.add(_path)
-            if not _path.endswith("/"):
-                _path += "/"
-            urls.append(path(_path, view, name=view.view_name()))
+        paths_seen = {}
 
         for view in self.registered_views:
-            add_view_path(view, f"p/{view.get_path()}")
+            view_path = view.get_path()
+
+            if not view_path:
+                raise ValueError(f"Path for {view} is empty")
+
+            if existing_view := paths_seen.get(view_path, None):
+                raise ValueError(
+                    f"Duplicate admin path {view_path}\n{existing_view}\n{view}"
+                )
+
+            paths_seen[view_path] = view
+
+            # Append trailing slashes automatically
+            if not view_path.endswith("/"):
+                view_path += "/"
+
+            urls.append(path(f"p/{view_path}", view, name=view.view_name()))
 
         return urls
 

{plain_admin-0.18.0 → plain_admin-0.19.1}/pyproject.toml

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

{plain_admin-0.18.0 → plain_admin-0.19.1}/plain/admin/views/objects.py

@@ -306,18 +306,6 @@ class AdminDetailView(AdminView, DetailView):
 
         return links
 
-    def get_success_url(self, form):
-        if detail_url := self.get_detail_url(self.object):
-            return detail_url
-
-        if list_url := self.get_list_url():
-            return list_url
-
-        if update_url := self.get_update_url(self.object):
-            return update_url
-
-        return super().get_success_url(form)
-
 
 class AdminUpdateView(AdminView, UpdateView):
     template_name = None
@@ -355,6 +343,18 @@ class AdminUpdateView(AdminView, UpdateView):
 
         return links
 
+    def get_success_url(self, form):
+        if detail_url := self.get_detail_url(self.object):
+            return detail_url
+
+        if list_url := self.get_list_url():
+            return list_url
+
+        if update_url := self.get_update_url(self.object):
+            return update_url
+
+        return super().get_success_url(form)
+
 
 class AdminDeleteView(AdminView, DeleteView):
     template_name = "admin/delete.html"