django-unfold 0.56.0__tar.gz → 0.58.0__tar.gz

{django_unfold-0.56.0 → django_unfold-0.58.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-unfold
-Version: 0.56.0
+Version: 0.58.0
 Summary: Modern Django admin theme for seamless interface development
 License: MIT
 Keywords: django,admin,tailwind,theme

{django_unfold-0.56.0 → django_unfold-0.58.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.56.0"
+version = "0.58.0"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"
@@ -28,13 +28,12 @@ django = ">=4.2"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.3"
-pytest-django = "^4.9"
-tox = "^4.21"
-django-money = "^3.5.3"
-
+pytest-django = "^4.11"
+tox = "^4.26"
+django-money = "^3.5"
 
 [tool.poetry.group.dev.dependencies]
-python-semantic-release = "^8.7"
+python-semantic-release = "^9.21"
 
 [tool.ruff]
 fix = true

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/contrib/import_export/templates/admin/import_export/base.html

@@ -1,11 +1,7 @@
 {% extends "admin/base_site.html" %}
 {% load admin_modify admin_urls i18n static  %}
 
-{% block extrastyle %}
-    {{ block.super }}
-
-    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
-{% endblock %}
+{% block extrastyle %}{{ block.super }}{% endblock %}
 
 {% block bodyclass %}
     {{ block.super }} {{ opts.app_label }}-{{ opts.object_name.lower }} change-form

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/contrib/import_export/templates/admin/import_export/import_form.html

@@ -6,7 +6,7 @@
 
         {% include "admin/import_export/resource_fields_list.html" with import_or_export="import" %}
 
-        <fieldset class="border border-base-200 mb-8 rounded-default pt-3 px-3 shadow-xs dark:border-base-800">
+        <fieldset class="border border-base-200 mb-8 rounded-default pt-2.5 px-3 shadow-xs dark:border-base-800">
             {% for field in form %}
                 {% if field.field.widget.attrs.readonly %}
                     {% include "unfold/helpers/field_readonly.html" with title=field.label value=field.field.value %}

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/contrib/simple_history/templates/simple_history/object_history_form.html

@@ -43,7 +43,7 @@
 {% endblock %}
 
 {% block form_top %}
-    <p class="px-3 py-3 rounded-default text-sm last:mb-8 er-amber-600/10 bg-blue-50 mb-8 text-blue-500 dark:bg-blue-500/20 dark:border-blue-500/10">
+    <p class="px-3 py-3 rounded-default text-sm last:mb-8 bg-blue-50 mb-8 text-blue-500 dark:bg-blue-500/20">
         {% if not revert_disabled %}
             {% blocktrans %}Press the 'Revert' button below to revert to this version of the object.{% endblocktrans %}
         {% endif %}

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/decorators.py

@@ -8,8 +8,7 @@ from django.db.models.expressions import BaseExpression, Combinable
 from django.http import HttpRequest, HttpResponse
 
 from unfold.enums import ActionVariant
-
-from .typing import ActionFunction
+from unfold.typing import ActionFunction
 
 
 def action(

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/forms.py

@@ -22,11 +22,12 @@ from django.http import HttpRequest
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
-from .widgets import (
+from unfold.widgets import (
     BASE_INPUT_CLASSES,
     INPUT_CLASSES,
     UnfoldAdminPasswordInput,
     UnfoldAdminRadioSelectWidget,
+    UnfoldAdminSelectWidget,
 )
 
 
@@ -37,7 +38,7 @@ class UnfoldReadOnlyPasswordHashWidget(ReadOnlyPasswordHashWidget):
 class ActionForm(forms.Form):
     action = forms.ChoiceField(
         label="",
-        widget=forms.Select(
+        widget=UnfoldAdminSelectWidget(
             {
                 "class": " ".join(
                     [

django_unfold-0.58.0/src/unfold/layout.py

@@ -0,0 +1,41 @@
+from crispy_forms.layout import BaseInput, LayoutObject
+from crispy_forms.utils import TEMPLATE_PACK
+from django.template.loader import render_to_string
+
+from unfold.widgets import BUTTON_CLASSES
+
+
+class ButtonClassesMixin:
+    def __init__(self, *args, css_class=None, **kwargs):
+        classes = BUTTON_CLASSES
+
+        if css_class:
+            classes.append(css_class)
+
+        self.field_classes = " ".join(classes)
+
+        super().__init__(*args, **kwargs)
+
+
+class Submit(ButtonClassesMixin, BaseInput):
+    input_type = "submit"
+
+
+class Button(ButtonClassesMixin, BaseInput):
+    input_type = "button"
+
+
+class Hr(LayoutObject):
+    template = "unfold_crispy/layout/hr.html"
+
+    def __init__(self, title=None, *args, **kwargs):
+        self.title = title
+        super().__init__(*args, **kwargs)
+
+    def render(self, form, context, template_pack=TEMPLATE_PACK, **kwargs):
+        return render_to_string(
+            self.template,
+            {
+                "title": self.title,
+            },
+        )

{django_unfold-0.56.0 → django_unfold-0.58.0}/src/unfold/sites.py

@@ -243,58 +243,58 @@ class UnfoldAdminSite(AdminSite):
         results = []
 
         for group in copy.deepcopy(navigation):
-            allowed_items = []
-
-            for item in group["items"]:
-                if "active" in item:
-                    item["active"] = self._get_value(item["active"], request)
-                else:
-                    item["active"] = self._get_is_active(
-                        request, item.get("link_callback") or item["link"]
-                    )
+            group["items"] = self._get_navigation_items(request, group["items"], tabs)
+            results.append(group)
 
-                # Checks if any tab item is active and then marks the sidebar link as active
-                for tab in tabs:
-                    has_primary_link = False
-                    has_tab_link_active = False
+        return results
 
-                    for tab_item in tab["items"]:
-                        if item["link"] == tab_item["link"]:
-                            has_primary_link = True
-                            continue
+    def _get_navigation_items(
+        self, request: HttpRequest, items: list[dict], tabs: list[dict] = None
+    ) -> list:
+        allowed_items = []
 
-                        if self._get_is_active(
-                            request, tab_item.get("link_callback") or tab_item["link"]
-                        ):
-                            has_tab_link_active = True
-                            break
+        for item in items:
+            link = item.get("link")
 
-                    if has_primary_link and has_tab_link_active:
-                        item["active"] = True
+            if "active" in item:
+                item["active"] = self._get_value(item["active"], request)
+            else:
+                item["active"] = self._get_is_active(
+                    request, item.get("link_callback") or link
+                )
 
-                if isinstance(item["link"], Callable):
-                    item["link_callback"] = lazy(item["link"])(request)
+            # Checks if any tab item is active and then marks the sidebar link as active
+            if (
+                tabs
+                and (is_active := self._get_is_tab_active(request, tabs, link))
+                and is_active
+            ):
+                item["active"] = True
 
-                # Permission callback
-                item["has_permission"] = self._call_permission_callback(
-                    item.get("permission"), request
-                )
+            # Link callback
+            if isinstance(link, Callable):
+                item["link_callback"] = lazy(link)(request)
 
-                # Badge callbacks
-                if "badge" in item and isinstance(item["badge"], str):
-                    try:
-                        callback = import_string(item["badge"])
-                        item["badge_callback"] = lazy(callback)(request)
-                    except ImportError:
-                        pass
+            # Permission callback
+            item["has_permission"] = self._call_permission_callback(
+                item.get("permission"), request
+            )
 
-                allowed_items.append(item)
+            # Badge callbacks
+            if "badge" in item and isinstance(item["badge"], str):
+                try:
+                    callback = import_string(item["badge"])
+                    item["badge_callback"] = lazy(callback)(request)
+                except ImportError:
+                    pass
 
-            group["items"] = allowed_items
+            # Process nested items
+            if "items" in item:
+                item["items"] = self._get_navigation_items(request, item["items"])
 
-            results.append(group)
+            allowed_items.append(item)
 
-        return results
+        return allowed_items
 
     def get_tabs_list(self, request: HttpRequest) -> list[dict[str, Any]]:
         tabs = copy.deepcopy(self._get_config("TABS", request))
@@ -381,6 +381,29 @@ class UnfoldAdminSite(AdminSite):
 
         return False
 
+    def _get_is_tab_active(
+        self, request: HttpRequest, tabs: list[dict], link: str
+    ) -> bool:
+        for tab in tabs:
+            has_primary_link = False
+            has_tab_link_active = False
+
+            for tab_item in tab["items"]:
+                if link == tab_item["link"]:
+                    has_primary_link = True
+                    continue
+
+                if self._get_is_active(
+                    request, tab_item.get("link_callback") or tab_item["link"]
+                ):
+                    has_tab_link_active = True
+                    break
+
+            if has_primary_link and has_tab_link_active:
+                return True
+
+        return False
+
     def _get_config(self, key: str, *args) -> Any:
         config = get_config(self.settings_name)