django-unfold 0.57.0__tar.gz → 0.59.0__tar.gz

{django_unfold-0.57.0 → django_unfold-0.59.0}/PKG-INFO

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

{django_unfold-0.57.0 → django_unfold-0.59.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.57.0"
+version = "0.59.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.57.0 → django_unfold-0.59.0}/src/unfold/checks.py

@@ -2,9 +2,10 @@ from typing import Any
 
 from django.contrib.admin.checks import ModelAdminChecks
 from django.contrib.admin.options import BaseModelAdmin
+from django.contrib.auth.models import Permission
 from django.core import checks
 
-from .dataclasses import UnfoldAction
+from unfold.dataclasses import UnfoldAction
 
 
 class UnfoldModelAdminChecks(ModelAdminChecks):
@@ -29,14 +30,35 @@ class UnfoldModelAdminChecks(ModelAdminChecks):
         for action in actions:
             if not hasattr(action.method, "allowed_permissions"):
                 continue
+
             for permission in action.method.allowed_permissions:
+                # Check the existence of Django permission
+                if "." in permission:
+                    app_label, codename = permission.split(".")
+
+                    if not Permission.objects.filter(
+                        content_type__app_label=app_label,
+                        codename=codename,
+                    ).exists():
+                        errors.append(
+                            checks.Error(
+                                f"@action decorator on {action.method.original_function_name}() in class {obj.__class__.__name__} specifies permission {permission} which does not exists.",
+                                obj=obj.__class__,
+                                id="admin.E129",
+                            )
+                        )
+
+                    continue
+
+                # Check the permission method existence
                 method_name = f"has_{permission}_permission"
                 if not hasattr(obj, method_name):
                     errors.append(
                         checks.Error(
-                            f"{obj.__class__.__name__} must define a {method_name}() method for the {action.method.__name__} action.",
+                            f"{obj.__class__.__name__} must define a {method_name}() method for the {action.method.original_function_name}() action.",
                             obj=obj.__class__,
                             id="admin.E129",
                         )
                     )
+
         return errors

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_slider.html

@@ -9,11 +9,11 @@
 
         {% if choice.min is not None and choice.max is not None and choice.step %}
             <div class="admin-numeric-filter-slider-tooltips">
-                <span class="admin-numeric-filter-slider-tooltip-from border cursor-not-allowed flex grow flex-row items-center mr-auto rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
+                <span class="admin-numeric-filter-slider-tooltip-from border border-base-200 cursor-not-allowed flex grow flex-row items-center mr-auto rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
                     {{ choice.value_from }}
                 </span>
 
-                <span class="admin-numeric-filter-slider-tooltip-to border cursor-not-allowed flex grow flex-row items-center rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
+                <span class="admin-numeric-filter-slider-tooltip-to border border-base-200 cursor-not-allowed flex grow flex-row items-center rounded-default shadow-xs px-3 py-2 w-full dark:bg-base-900 dark:border-base-700 dark:text-font-default-dark">
                     {{ choice.value_to }}
                 </span>
             </div>

{django_unfold-0.57.0 → django_unfold-0.59.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.57.0 → django_unfold-0.59.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.57.0 → django_unfold-0.59.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.57.0 → django_unfold-0.59.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(
@@ -30,13 +29,19 @@ def action(
             **kwargs,
         ) -> Optional[HttpResponse]:
             if permissions:
-                permission_checks = (
-                    getattr(model_admin, f"has_{permission}_permission")
-                    for permission in permissions
-                )
-                # Permissions methods have following syntax: has_<some>_permission(self, request, obj=None):
-                # But obj is not examined by default in django admin and it would also require additional
-                # fetch from database, therefore it is not supported yet
+                permission_rules = []
+
+                for permission in permissions:
+                    if "." in permission:
+                        permission_rules.append(permission)
+                    else:
+                        # Permissions methods have following syntax: has_<some>_permission(self, request, obj=None):
+                        # But obj is not examined by default in django admin and it would also require additional
+                        # fetch from database, therefore it is not supported yet
+                        permission_rules.append(
+                            getattr(model_admin, f"has_{permission}_permission")
+                        )
+
                 has_detail_action = func.__name__ in model_admin._extract_action_names(
                     model_admin.actions_detail
                 )
@@ -47,12 +52,19 @@ def action(
                     )
                 )
 
-                if not all(
-                    has_permission(request, kwargs.get("object_id"))
-                    if has_detail_action or has_submit_line_action
-                    else has_permission(request)
-                    for has_permission in permission_checks
-                ):
+                permission_checks = []
+
+                for permission_rule in permission_rules:
+                    if isinstance(permission_rule, str) and "." in permission_rule:
+                        permission_checks.append(request.user.has_perm(permission_rule))
+                    elif has_detail_action or has_submit_line_action:
+                        permission_checks.append(
+                            permission_rule(request, kwargs.get("object_id"))
+                        )
+                    else:
+                        permission_checks.append(permission_rule(request))
+
+                if not all(permission_checks):
                     raise PermissionDenied
             return func(model_admin, request, *args, **kwargs)
 
@@ -74,6 +86,7 @@ def action(
             inner.variant = ActionVariant.DEFAULT
 
         inner.attrs = attrs or {}
+        inner.original_function_name = func.__name__
         return inner
 
     if function is None:

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/fields.py

@@ -140,7 +140,7 @@ class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
                 ):
                     result_repr = self.get_admin_url(f.remote_field, value)
                 elif isinstance(f, models.JSONField):
-                    formatted_output = prettify_json(value)
+                    formatted_output = prettify_json(value, f.encoder)
 
                     if formatted_output:
                         return formatted_output

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/forms.py

@@ -43,15 +43,17 @@ class ActionForm(forms.Form):
                 "class": " ".join(
                     [
                         "appearance-none",
-                        "bg-white/20",
+                        "!bg-white/20",
                         "font-medium",
                         "grow",
                         "px-3",
                         "py-2",
                         "pr-8",
                         "rounded-default",
-                        "text-white",
+                        "!text-white",
                         "truncate",
+                        "!outline-primary-400",
+                        "dark:!outline-primary-700",
                         "*:text-base-700",
                         "lg:w-72",
                     ]

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/layout.py

@@ -25,6 +25,22 @@ class Button(ButtonClassesMixin, BaseInput):
     input_type = "button"
 
 
+class FieldsetSubheader(LayoutObject):
+    template = "unfold_crispy/layout/fieldset_subheader.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,
+            },
+        )
+
+
 class Hr(LayoutObject):
     template = "unfold_crispy/layout/hr.html"
 

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/mixins/action_model_admin.py

@@ -316,19 +316,27 @@ class ActionModelAdminMixin:
                 filtered_actions.append(action)
                 continue
 
-            permission_checks = (
-                getattr(self, f"has_{permission}_permission")
-                for permission in action.method.allowed_permissions
-            )
-
-            if object_id:
-                if all(
-                    has_permission(request, object_id)
-                    for has_permission in permission_checks
-                ):
-                    filtered_actions.append(action)
-            else:
-                if all(has_permission(request) for has_permission in permission_checks):
-                    filtered_actions.append(action)
+            permission_rules = []
+
+            for permission in action.method.allowed_permissions:
+                if "." in permission:
+                    permission_rules.append(permission)
+                else:
+                    permission_rules.append(
+                        getattr(self, f"has_{permission}_permission")
+                    )
+
+            permission_checks = []
+
+            for permission_rule in permission_rules:
+                if isinstance(permission_rule, str) and "." in permission_rule:
+                    permission_checks.append(request.user.has_perm(permission_rule))
+                elif object_id:
+                    permission_checks.append(permission_rule(request, object_id))
+                else:
+                    permission_checks.append(permission_rule(request))
+
+            if all(permission_checks):
+                filtered_actions.append(action)
 
         return filtered_actions

django_unfold-0.59.0/src/unfold/paginator.py

@@ -0,0 +1,21 @@
+from django.core.paginator import Page, Paginator
+from django.utils.functional import cached_property
+
+
+class InfinitePage(Page):
+    def has_next(self):
+        if len(self.object_list) == 0:
+            return False
+
+        return self.number < self.paginator.num_pages
+
+
+class InfinitePaginator(Paginator):
+    template_name = "unfold/helpers/pagination_infinite.html"
+
+    @cached_property
+    def count(self):
+        return 9_999_999_999
+
+    def _get_page(self, *args, **kwargs):
+        return InfinitePage(*args, **kwargs)

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/settings.py

@@ -57,10 +57,17 @@ CONFIG_DEFAULTS = {
     "ENVIRONMENT_TITLE_PREFIX": None,
     "STYLES": [],
     "SCRIPTS": [],
+    "ACCOUNT": {
+        "navigation": [],
+    },
+    "LANGUAGES": {
+        "action": None,
+        "navigation": [],
+    },
     "SIDEBAR": {
         "show_search": False,
         "show_all_applications": False,
-        "navigation": {},
+        "navigation": [],
     },
     "TABS": [],
     "LOGIN": {

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/sites.py

@@ -102,6 +102,13 @@ class UnfoldAdminSite(AdminSite):
             "environment_title_prefix": self._get_config(
                 "ENVIRONMENT_TITLE_PREFIX", request
             ),
+            "languages_list": self._get_value(
+                self._get_config("LANGUAGES", request).get("navigation"), request
+            ),
+            "languages_action": self._get_value(
+                self._get_config("LANGUAGES", request).get("action"), request
+            ),
+            "account_links": self._get_account_links(request),
             "tab_list": self.get_tabs_list(request),
             "styles": self._get_list("STYLES", request),
             "scripts": self._get_list("SCRIPTS", request),
@@ -243,58 +250,75 @@ class UnfoldAdminSite(AdminSite):
         results = []
 
         for group in copy.deepcopy(navigation):
-            allowed_items = []
+            group["items"] = self._get_navigation_items(request, group["items"], tabs)
+            results.append(group)
 
-            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"]
-                    )
+        return results
 
-                # 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
+    def _get_navigation_items(
+        self, request: HttpRequest, items: list[dict], tabs: list[dict] = None
+    ) -> list:
+        allowed_items = []
 
-                    for tab_item in tab["items"]:
-                        if item["link"] == tab_item["link"]:
-                            has_primary_link = True
-                            continue
+        for item in items:
+            link = item.get("link")
 
-                        if self._get_is_active(
-                            request, tab_item.get("link_callback") or tab_item["link"]
-                        ):
-                            has_tab_link_active = True
-                            break
+            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 has_primary_link and has_tab_link_active:
-                        item["active"] = True
+            # 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
 
-                if isinstance(item["link"], Callable):
-                    item["link_callback"] = lazy(item["link"])(request)
+            # Link callback
+            if isinstance(link, Callable):
+                item["link_callback"] = lazy(link)(request)
 
-                # Permission callback
-                item["has_permission"] = self._call_permission_callback(
-                    item.get("permission"), request
-                )
+            # Permission callback
+            item["has_permission"] = self._call_permission_callback(
+                item.get("permission"), 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
+            # 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
 
-                allowed_items.append(item)
+            # Process nested items
+            if "items" in item:
+                item["items"] = self._get_navigation_items(request, item["items"])
 
-            group["items"] = allowed_items
+            allowed_items.append(item)
 
-            results.append(group)
+        return allowed_items
 
-        return results
+    def _get_account_links(self, request: HttpRequest) -> list[dict[str, Any]]:
+        links = []
+
+        navigation = self._get_value(
+            get_config(self.settings_name)["ACCOUNT"].get("navigation"), request
+        )
+
+        for item in navigation:
+            links.append(
+                {
+                    "title": self._get_value(item["title"], request),
+                    "link": self._get_value(item["link"], request),
+                }
+            )
+
+        return links
 
     def get_tabs_list(self, request: HttpRequest) -> list[dict[str, Any]]:
         tabs = copy.deepcopy(self._get_config("TABS", request))
@@ -381,6 +405,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)
 

{django_unfold-0.57.0 → django_unfold-0.59.0}/src/unfold/static/admin/js/admin/RelatedObjectLookups.js

@@ -74,9 +74,15 @@
 
   function updateRelatedObjectLinks(triggeringLink) {
     const $this = $(triggeringLink);
-    const siblings = $this.nextAll(
-      ".view-related, .change-related, .delete-related"
-    );
+    // !CHANGED from original
+    // const siblings = $this.nextAll(
+    //   ".view-related, .change-related, .delete-related"
+    // );
+
+    const siblings = $this
+      .parent()
+      .nextAll(".view-related, .change-related, .delete-related");
+
     if (!siblings.length) {
       return;
     }