django-unfold 0.59.0__py3-none-any.whl → 0.61.0__py3-none-any.whl

unfold/forms.py

@@ -1,4 +1,5 @@
-from typing import Optional
+from collections.abc import Generator
+from typing import Optional, Union
 
 from django import forms
 from django.contrib.admin.forms import (
@@ -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 _
 
@@ -146,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[Union["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/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, Any]] = 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:
@@ -90,7 +104,12 @@ class BaseModelAdminMixin:
         self, db_field: Field, request: HttpRequest, **kwargs
     ) -> Optional[Field]:
         if "widget" not in kwargs:
-            kwargs["widget"] = widgets.UnfoldAdminNullBooleanSelectWidget()
+            if db_field.choices:
+                kwargs["widget"] = widgets.UnfoldAdminSelectWidget(
+                    choices=db_field.choices
+                )
+            else:
+                kwargs["widget"] = widgets.UnfoldAdminNullBooleanSelectWidget()
 
         return db_field.formfield(**kwargs)
 

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),
@@ -170,6 +170,7 @@ class UnfoldAdminSite(AdminSite):
     ) -> TemplateResponse:
         query = request.GET.get("s").lower()
         app_list = super().get_app_list(request)
+        apps = []
         results = []
 
         if query in EMPTY_VALUES:
@@ -177,7 +178,7 @@ class UnfoldAdminSite(AdminSite):
 
         for app in app_list:
             if query in app["name"].lower():
-                results.append(app)
+                apps.append(app)
                 continue
 
             models = []
@@ -188,7 +189,16 @@ class UnfoldAdminSite(AdminSite):
 
             if len(models) > 0:
                 app["models"] = models
-                results.append(app)
+                apps.append(app)
+
+        for app in apps:
+            for model in app["models"]:
+                results.append(
+                    {
+                        "app": app,
+                        "model": model,
+                    }
+                )
 
         return TemplateResponse(
             request,
@@ -196,34 +206,11 @@ class UnfoldAdminSite(AdminSite):
             context={
                 "results": results,
             },
+            headers={
+                "HX-Trigger": "search",
+            },
         )
 
-    @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:

unfold/static/admin/js/admin/RelatedObjectLookups.js

@@ -80,8 +80,8 @@
     // );
 
     const siblings = $this
-      .parent()
-      .nextAll(".view-related, .change-related, .delete-related");
+      .closest(".related-widget-wrapper")
+      .find(".view-related, .change-related, .delete-related");
 
     if (!siblings.length) {
       return;