django-unfold 0.58.0__py3-none-any.whl → 0.60.0__py3-none-any.whl

unfold/fields.py

@@ -17,33 +17,24 @@ from django.utils.module_loading import import_string
 from django.utils.safestring import SafeText, mark_safe
 from django.utils.text import capfirst
 
-from unfold.mixins import BaseModelAdminMixin
 from unfold.settings import get_config
 from unfold.utils import display_for_field, prettify_json
-from unfold.widgets import CHECKBOX_LABEL_CLASSES, LABEL_CLASSES
+from unfold.widgets import (
+    CHECKBOX_LABEL_CLASSES,
+    INPUT_CLASSES,
+    LABEL_CLASSES,
+)
 
 
 class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
     def label_tag(self) -> SafeText:
-        from .admin import ModelAdmin
-
-        if not isinstance(self.model_admin, ModelAdmin) and not isinstance(
-            self.model_admin, BaseModelAdminMixin
-        ):
-            return super().label_tag()
-
         attrs = {
             "class": " ".join(LABEL_CLASSES + ["mb-2"]),
         }
 
         label = self.field["label"]
 
-        return format_html(
-            "<label{}>{}{}</label>",
-            flatatt(attrs),
-            capfirst(label),
-            self.form.label_suffix,
-        )
+        return format_html("<label{}>{}</label>", flatatt(attrs), capfirst(label))
 
     def is_json(self) -> bool:
         field, obj, model_admin = (
@@ -140,7 +131,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
@@ -174,12 +165,19 @@ class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
 
 
 class UnfoldAdminField(helpers.AdminField):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        try:
+            from location_field.widgets import LocationWidget
+
+            if isinstance(self.field.field.widget, LocationWidget):
+                self.field.field.widget.attrs["class"] = " ".join(INPUT_CLASSES)
+        except ImportError:
+            pass
+
     def label_tag(self) -> SafeText:
         classes = []
-        if not self.field.field.widget.__class__.__name__.startswith(
-            "Unfold"
-        ) and not self.field.field.widget.template_name.startswith("unfold"):
-            return super().label_tag()
 
         # TODO load config from current AdminSite (override Fieldline.__iter__ method)
         for lang, flag in get_config()["EXTENSIONS"]["modeltranslation"][

unfold/forms.py

@@ -1,3 +1,4 @@
+from collections.abc import Generator
 from typing import Optional
 
 from django import forms
@@ -11,14 +12,23 @@ from django.contrib.auth.forms import (
     AdminPasswordChangeForm as BaseAdminPasswordChangeForm,
 )
 from django.contrib.auth.models import User
+from django.contrib.contenttypes.forms import BaseGenericInlineFormSet
+from django.core.paginator import Page, Paginator
+from django.db.models import QuerySet
+from django.forms import BaseInlineFormSet
+from django.http import HttpRequest
+
+from unfold.fields import UnfoldAdminField, UnfoldAdminReadonlyField
 
 try:
     from django.contrib.auth.forms import AdminUserCreationForm as BaseUserCreationForm
 except ImportError:
     from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
+from django.contrib.admin.helpers import AdminForm as BaseAdminForm
+from django.contrib.admin.helpers import Fieldline as BaseFieldline
+from django.contrib.admin.helpers import Fieldset as BaseFieldset
 from django.contrib.auth.forms import ReadOnlyPasswordHashWidget
 from django.contrib.auth.forms import UserChangeForm as BaseUserChangeForm
-from django.http import HttpRequest
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
@@ -43,15 +53,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",
                     ]
@@ -144,3 +156,87 @@ class AdminOwnPasswordChangeForm(BaseAdminOwnPasswordChangeForm):
         self.fields["old_password"].widget.attrs["class"] = " ".join(INPUT_CLASSES)
         self.fields["new_password1"].widget.attrs["class"] = " ".join(INPUT_CLASSES)
         self.fields["new_password2"].widget.attrs["class"] = " ".join(INPUT_CLASSES)
+
+
+class AdminForm(BaseAdminForm):
+    def __iter__(self) -> Generator["Fieldset", None, None]:
+        for name, options in self.fieldsets:
+            yield Fieldset(
+                self.form,
+                name,
+                readonly_fields=self.readonly_fields,
+                model_admin=self.model_admin,
+                **options,
+            )
+
+
+class Fieldset(BaseFieldset):
+    def __iter__(self) -> Generator["Fieldline", None, None]:
+        for field in self.fields:
+            yield Fieldline(
+                self.form, field, self.readonly_fields, model_admin=self.model_admin
+            )
+
+
+class Fieldline(BaseFieldline):
+    def __iter__(
+        self,
+    ) -> Generator["UnfoldAdminReadonlyField | UnfoldAdminField", None, None]:
+        for i, field in enumerate(self.fields):
+            if field in self.readonly_fields:
+                yield UnfoldAdminReadonlyField(
+                    self.form, field, is_first=(i == 0), model_admin=self.model_admin
+                )
+            else:
+                yield UnfoldAdminField(self.form, field, is_first=(i == 0))
+
+
+class PaginationFormSetMixin:
+    queryset: Optional[QuerySet] = None
+    request: Optional[HttpRequest] = None
+    per_page: Optional[int] = None
+
+    def __init__(
+        self,
+        request: Optional[HttpRequest] = None,
+        per_page: Optional[int] = None,
+        *args,
+        **kwargs,
+    ):
+        self.request = request
+        self.per_page = per_page
+
+        super().__init__(*args, **kwargs)
+
+        if self.per_page:
+            self.paginator = Paginator(self.queryset, self.per_page)
+            self.page = self.get_page(self.paginator, self.get_page_num())
+            self._queryset = self.page.object_list
+
+    def get_pagination_key(self) -> str:
+        return f"{self.prefix}-page"
+
+    def get_page_num(self) -> int:
+        page = self.request.GET.get(self.get_pagination_key())
+        if page and page.isnumeric() and page > "0":
+            return int(page)
+
+        page = self.request.POST.get(self.get_pagination_key())
+        if page and page.isnumeric() and page > "0":
+            return int(page)
+
+        return 1
+
+    def get_page(self, paginator: Paginator, page: int) -> Page:
+        if page <= paginator.num_pages:
+            return paginator.page(page)
+
+        return paginator.page(1)
+
+
+class PaginationInlineFormSet(PaginationFormSetMixin, BaseInlineFormSet):
+    pass
+
+
+class PaginationGenericInlineFormSet(PaginationFormSetMixin, BaseGenericInlineFormSet):
+    pass

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"
 

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

unfold/mixins/base_model_admin.py

@@ -1,6 +1,7 @@
 import copy
-from typing import Optional
+from typing import Any, Optional
 
+from django.contrib.admin import helpers
 from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.db import models
@@ -27,6 +28,19 @@ class BaseModelAdminMixin:
 
         super().__init__(model, admin_site)
 
+    def changeform_view(
+        self,
+        request: HttpRequest,
+        object_id: Optional[str] = None,
+        form_url: str = "",
+        extra_context: Optional[dict[str, bool]] = None,
+    ) -> Any:
+        from unfold.forms import AdminForm, Fieldline
+
+        helpers.AdminForm = AdminForm
+        helpers.Fieldline = Fieldline
+        return super().changeform_view(request, object_id, form_url, extra_context)
+
     def formfield_for_choice_field(
         self, db_field: Field, request: HttpRequest, **kwargs
     ) -> TypedChoiceField:

unfold/paginator.py

@@ -1,10 +1,21 @@
-from django.core.paginator import Paginator
+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)

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": {

unfold/sites.py

@@ -4,15 +4,12 @@ from typing import Any, Callable, Optional, Union
 from urllib.parse import parse_qs, urlparse
 
 from django.contrib.admin import AdminSite
-from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.core.validators import EMPTY_VALUES
 from django.http import HttpRequest, HttpResponse
 from django.template.response import TemplateResponse
 from django.urls import URLPattern, path, reverse, reverse_lazy
-from django.utils.decorators import method_decorator
 from django.utils.functional import lazy
 from django.utils.module_loading import import_string
-from django.views.decorators.cache import never_cache
 
 from unfold.dataclasses import DropdownItem, Favicon
 
@@ -91,6 +88,9 @@ class UnfoldAdminSite(AdminSite):
             "site_icon": self._get_theme_images("SITE_ICON", request),
             "site_symbol": self._get_config("SITE_SYMBOL", request),
             "site_favicons": self._get_favicons("SITE_FAVICONS", request),
+            "login_image": self._get_value(
+                get_config(self.settings_name)["LOGIN"].get("image"), request
+            ),
             "show_history": self._get_config("SHOW_HISTORY", request),
             "show_view_on_site": self._get_config("SHOW_VIEW_ON_SITE", request),
             "show_languages": self._get_config("SHOW_LANGUAGES", request),
@@ -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),
@@ -191,32 +198,6 @@ class UnfoldAdminSite(AdminSite):
             },
         )
 
-    @method_decorator(never_cache)
-    @login_not_required
-    def login(
-        self, request: HttpRequest, extra_context: Optional[dict[str, Any]] = None
-    ) -> HttpResponse:
-        extra_context = {} if extra_context is None else extra_context
-        image = self._get_value(
-            get_config(self.settings_name)["LOGIN"].get("image"), request
-        )
-
-        redirect_field_name = self._get_value(
-            get_config(self.settings_name)["LOGIN"].get("redirect_after"), request
-        )
-
-        if image not in EMPTY_VALUES:
-            extra_context.update(
-                {
-                    "image": image,
-                }
-            )
-
-        if redirect_field_name not in EMPTY_VALUES:
-            extra_context.update({REDIRECT_FIELD_NAME: redirect_field_name})
-
-        return super().login(request, extra_context)
-
     def password_change(
         self, request: HttpRequest, extra_context: Optional[dict[str, Any]] = None
     ) -> HttpResponse:
@@ -296,6 +277,23 @@ class UnfoldAdminSite(AdminSite):
 
         return allowed_items
 
+    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))
 

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
+      .closest(".related-widget-wrapper")
+      .find(".view-related, .change-related, .delete-related");
+
     if (!siblings.length) {
       return;
     }