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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: django-unfold
-Version: 0.59.0
+Version: 0.61.0
 Summary: Modern Django admin theme for seamless interface development
 License: MIT
 Keywords: django,admin,tailwind,theme
@@ -24,7 +24,7 @@ Description-Content-Type: text/markdown
 
 ![screenshot](https://github.com/user-attachments/assets/87aaad04-f454-42aa-b9ac-e14d41f189ac)
 
-## Unfold Django Admin Theme
+## Unfold - Django Admin Theme
 
 [![PyPI - Version](https://img.shields.io/pypi/v/django-unfold.svg?style=for-the-badge)](https://pypi.org/project/django-unfold/)
 [![Discord](https://img.shields.io/discord/1297493955231088650?style=for-the-badge&logo=discord&logoColor=%23ffffff&color=7289da)](https://discord.gg/9sQj9MEbNz)
@@ -40,21 +40,30 @@ Transform your Django admin into a powerful, modern administrative interface wit
 - **Turbo:** A Django & Next.js boilerplate implementing Unfold is available at [github.com/unfoldadmin/turbo](https://github.com/unfoldadmin/turbo?utm_medium=github&utm_source=unfold).
 - **Discord:** Join our Unfold community on [Discord](https://discord.gg/9sQj9MEbNz).
 
-## Django & Unfold Development Services
+## Profesional tools & services
 
-Need assistance with implementing Unfold or require custom Django development? Professional consulting and development services are available to help transform your Django admin interface and enhance your web applications. Whether migrating from the native Django admin to Unfold or seeking expert technical guidance, reach out to discuss your project requirements and explore development possibilities. [Get in touch](https://unfoldadmin.com/consulting?utm_medium=github&utm_source=unfold) to learn more about available services.
+Looking for professional help with your Django or Unfold project? We offer a range of tools and services to support your development process:
 
-## Unfold Studio
+### Consulting services
 
-Unfold Studio is a theme customizer for Django admin that helps you create a branded interface. You can customize colors, upload your logo, and adjust the style without coding. The tool is currently in development, and [you can join the waitlist](https://unfoldadmin.com/studio/) to be notified when it's available.
+Professional consulting services for Django applications — from architecture and performance optimization to feature development and Unfold integration.
+Ideal for teams looking to scale, modernize, or customize their Django projects with expert support. Learn more at [unfoldadmin.com/consulting](https://unfoldadmin.com/consulting/?utm_medium=github&utm_source=unfold).
+
+### Support package
+
+If you need assistance with integrating or customizing Unfold, support packages are available. They include live 1:1 calls, implementation review, and ongoing Discord-based support — fixed price, no ongoing commitment. Learn more at [unfoldadmin.com/support](https://unfoldadmin.com/support/?utm_medium=github&utm_source=unfold).
+
+### Unfold Studio
+
+Unfold Studio lets you visually customize your Django admin without writing code — update colors, logos, sidebar, and interface styles to match your brand in minutes. Give your admin a polished, professional look that feels truly yours. Available at [unfoldadmin.com/studio](https://unfoldadmin.com/studio).
 
 ## Fresh Features & Enhancements
 
+- **Paginated inlines:** Break down large record sets into pages within inlines for better admin performance
 - **Conditional fields:** Show or hide fields dynamically based on the values of other fields in the form
 - **Infinite paginator:** Efficiently handle large datasets with seamless pagination that reduces server load
 - **Checkbox & radio filters:** Enhanced filter options with checkbox and radio interfaces for intuitive filtering
 - **Site dropdown:** Configurable dropdown menu in the header area for managing custom navigation links
-- **Dropdown actions:** Organize action items in customizable dropdown menus
 
 ## Core Features & Capabilities
 
@@ -74,6 +83,7 @@ Unfold Studio is a theme customizer for Django admin that helps you create a bra
 - **Sortable inlines:** Allow sorting inlines by dragging and dropping
 - **Environment label:** Distinguish between environments by displaying a label
 - **Nonrelated inlines:** Display nonrelated models as inlines in the change form
+- **Paginated inlines:** Break down large record sets into pages within inlines for better admin performance
 - **Favicons:** Built-in support for configuring various site favicons
 - **Themes:** Allow customization of color scheme, background color, border radius, and more
 - **Font colors:** Adjust font colors for better readability

{django_unfold-0.59.0 → django_unfold-0.61.0}/README.md

@@ -1,6 +1,6 @@
 ![screenshot](https://github.com/user-attachments/assets/87aaad04-f454-42aa-b9ac-e14d41f189ac)
 
-## Unfold Django Admin Theme
+## Unfold - Django Admin Theme
 
 [![PyPI - Version](https://img.shields.io/pypi/v/django-unfold.svg?style=for-the-badge)](https://pypi.org/project/django-unfold/)
 [![Discord](https://img.shields.io/discord/1297493955231088650?style=for-the-badge&logo=discord&logoColor=%23ffffff&color=7289da)](https://discord.gg/9sQj9MEbNz)
@@ -16,21 +16,30 @@ Transform your Django admin into a powerful, modern administrative interface wit
 - **Turbo:** A Django & Next.js boilerplate implementing Unfold is available at [github.com/unfoldadmin/turbo](https://github.com/unfoldadmin/turbo?utm_medium=github&utm_source=unfold).
 - **Discord:** Join our Unfold community on [Discord](https://discord.gg/9sQj9MEbNz).
 
-## Django & Unfold Development Services
+## Profesional tools & services
 
-Need assistance with implementing Unfold or require custom Django development? Professional consulting and development services are available to help transform your Django admin interface and enhance your web applications. Whether migrating from the native Django admin to Unfold or seeking expert technical guidance, reach out to discuss your project requirements and explore development possibilities. [Get in touch](https://unfoldadmin.com/consulting?utm_medium=github&utm_source=unfold) to learn more about available services.
+Looking for professional help with your Django or Unfold project? We offer a range of tools and services to support your development process:
 
-## Unfold Studio
+### Consulting services
 
-Unfold Studio is a theme customizer for Django admin that helps you create a branded interface. You can customize colors, upload your logo, and adjust the style without coding. The tool is currently in development, and [you can join the waitlist](https://unfoldadmin.com/studio/) to be notified when it's available.
+Professional consulting services for Django applications — from architecture and performance optimization to feature development and Unfold integration.
+Ideal for teams looking to scale, modernize, or customize their Django projects with expert support. Learn more at [unfoldadmin.com/consulting](https://unfoldadmin.com/consulting/?utm_medium=github&utm_source=unfold).
+
+### Support package
+
+If you need assistance with integrating or customizing Unfold, support packages are available. They include live 1:1 calls, implementation review, and ongoing Discord-based support — fixed price, no ongoing commitment. Learn more at [unfoldadmin.com/support](https://unfoldadmin.com/support/?utm_medium=github&utm_source=unfold).
+
+### Unfold Studio
+
+Unfold Studio lets you visually customize your Django admin without writing code — update colors, logos, sidebar, and interface styles to match your brand in minutes. Give your admin a polished, professional look that feels truly yours. Available at [unfoldadmin.com/studio](https://unfoldadmin.com/studio).
 
 ## Fresh Features & Enhancements
 
+- **Paginated inlines:** Break down large record sets into pages within inlines for better admin performance
 - **Conditional fields:** Show or hide fields dynamically based on the values of other fields in the form
 - **Infinite paginator:** Efficiently handle large datasets with seamless pagination that reduces server load
 - **Checkbox & radio filters:** Enhanced filter options with checkbox and radio interfaces for intuitive filtering
 - **Site dropdown:** Configurable dropdown menu in the header area for managing custom navigation links
-- **Dropdown actions:** Organize action items in customizable dropdown menus
 
 ## Core Features & Capabilities
 
@@ -50,6 +59,7 @@ Unfold Studio is a theme customizer for Django admin that helps you create a bra
 - **Sortable inlines:** Allow sorting inlines by dragging and dropping
 - **Environment label:** Distinguish between environments by displaying a label
 - **Nonrelated inlines:** Display nonrelated models as inlines in the change form
+- **Paginated inlines:** Break down large record sets into pages within inlines for better admin performance
 - **Favicons:** Built-in support for configuring various site favicons
 - **Themes:** Allow customization of color scheme, background color, border radius, and more
 - **Font colors:** Adjust font colors for better readability

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.59.0"
+version = "0.61.0"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"
@@ -29,6 +29,7 @@ django = ">=4.2"
 [tool.poetry.group.test.dependencies]
 pytest = "^8.3"
 pytest-django = "^4.11"
+pytest-factoryboy = "^2.7.0"
 tox = "^4.26"
 django-money = "^3.5"
 

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/unfold/admin.py

@@ -1,11 +1,18 @@
 from functools import update_wrapper
-from typing import Optional
+from typing import Any, Optional
 
 from django import forms
 from django.contrib.admin import ModelAdmin as BaseModelAdmin
 from django.contrib.admin import StackedInline as BaseStackedInline
 from django.contrib.admin import TabularInline as BaseTabularInline
 from django.contrib.admin import display, helpers
+from django.contrib.admin.options import InlineModelAdmin
+from django.contrib.contenttypes.admin import (
+    GenericStackedInline as BaseGenericStackedInline,
+)
+from django.contrib.contenttypes.admin import (
+    GenericTabularInline as BaseGenericTabularInline,
+)
 from django.db.models import BLANK_CHOICE_DASH, Model
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect
@@ -16,8 +23,11 @@ from django.utils.translation import gettext_lazy as _
 from django.views import View
 
 from unfold.checks import UnfoldModelAdminChecks
-from unfold.fields import UnfoldAdminField, UnfoldAdminReadonlyField
-from unfold.forms import ActionForm
+from unfold.forms import (
+    ActionForm,
+    PaginationGenericInlineFormSet,
+    PaginationInlineFormSet,
+)
 from unfold.mixins import ActionModelAdminMixin, BaseModelAdminMixin
 from unfold.overrides import FORMFIELD_OVERRIDES_INLINE
 from unfold.typing import FieldsetsType
@@ -32,10 +42,6 @@ checkbox = UnfoldBooleanWidget(
     lambda value: False,
 )
 
-helpers.AdminField = UnfoldAdminField
-
-helpers.AdminReadonlyField = UnfoldAdminReadonlyField
-
 
 class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     action_form = ActionForm
@@ -182,16 +188,42 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     def get_changelist(self, request, **kwargs):
         return ChangeList
 
+    def get_formset_kwargs(
+        self, request: HttpRequest, obj: Model, inline: InlineModelAdmin, prefix: str
+    ) -> dict[str, Any]:
+        formset_kwargs = super().get_formset_kwargs(request, obj, inline, prefix)
 
-class TabularInline(BaseModelAdminMixin, BaseTabularInline):
-    formfield_overrides = FORMFIELD_OVERRIDES_INLINE
-    readonly_preprocess_fields = {}
-    ordering_field = None
-    hide_ordering_field = False
+        if hasattr(inline, "per_page"):
+            formset_kwargs["request"] = request
+            formset_kwargs["per_page"] = inline.per_page
 
+        return formset_kwargs
 
-class StackedInline(BaseModelAdminMixin, BaseStackedInline):
+
+class BaseInlineMixin:
     formfield_overrides = FORMFIELD_OVERRIDES_INLINE
     readonly_preprocess_fields = {}
     ordering_field = None
+    per_page = None
     hide_ordering_field = False
+    collapsible = False
+
+
+class TabularInline(BaseInlineMixin, BaseModelAdminMixin, BaseTabularInline):
+    formset = PaginationInlineFormSet
+
+
+class StackedInline(BaseInlineMixin, BaseModelAdminMixin, BaseStackedInline):
+    formset = PaginationInlineFormSet
+
+
+class GenericStackedInline(
+    BaseInlineMixin, BaseModelAdminMixin, BaseGenericStackedInline
+):
+    formset = PaginationGenericInlineFormSet
+
+
+class GenericTabularInline(
+    BaseInlineMixin, BaseModelAdminMixin, BaseGenericTabularInline
+):
+    formset = PaginationGenericInlineFormSet

django_unfold-0.61.0/src/unfold/contrib/import_export/templates/admin/import_export/change_list_import.html

@@ -0,0 +1,5 @@
+{% extends "admin/import_export/change_list.html" %}
+
+{% block actions-items %}
+    {% include "admin/import_export/change_list_import_item.html" %}
+{% endblock %}

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/unfold/contrib/inlines/admin.py

@@ -12,10 +12,15 @@ from django.http import HttpRequest
 from django.utils.text import get_text_list
 from django.utils.translation import gettext_lazy as _
 
-from unfold.admin import StackedInline, TabularInline
-
-from .checks import NonrelatedModelAdminChecks
-from .forms import NonrelatedInlineModelFormSet, nonrelated_inline_formset_factory
+from unfold.admin import (
+    StackedInline,
+    TabularInline,
+)
+from unfold.contrib.inlines.checks import NonrelatedModelAdminChecks
+from unfold.contrib.inlines.forms import (
+    NonrelatedInlineModelFormSet,
+    nonrelated_inline_formset_factory,
+)
 
 
 class NonrelatedInlineMixin:
@@ -135,8 +140,8 @@ class NonrelatedInlineMixin:
 
 
 class NonrelatedStackedInline(NonrelatedInlineMixin, StackedInline):
-    pass
+    formset = NonrelatedInlineModelFormSet
 
 
 class NonrelatedTabularInline(NonrelatedInlineMixin, TabularInline):
-    pass
+    formset = NonrelatedInlineModelFormSet

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/unfold/contrib/inlines/forms.py

@@ -3,8 +3,10 @@ from typing import Any, Callable, Optional
 from django.db.models import Model, QuerySet
 from django.forms import BaseModelFormSet, ModelForm, modelformset_factory
 
+from unfold.forms import PaginationFormSetMixin
 
-class NonrelatedInlineModelFormSet(BaseModelFormSet):
+
+class NonrelatedInlineModelFormSet(PaginationFormSetMixin, BaseModelFormSet):
     def __init__(
         self,
         instance: Optional[Model] = None,

django_unfold-0.61.0/src/unfold/contrib/location_field/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DefaultAppConfig(AppConfig):
+    name = "unfold.contrib.location_field"
+    label = "unfold_location_field"

django_unfold-0.61.0/src/unfold/contrib/location_field/templates/location_field/map_widget.html

@@ -0,0 +1,5 @@
+<div class="map-widget flex flex-col gap-2">
+    {{ field_input }}
+
+    <div id="map_{{ field_name }}" class="border gap-2 h-72 max-w-2xl rounded-default shadow-xs"></div>
+</div>

django_unfold-0.61.0/src/unfold/contrib/simple_history/templates/simple_history/submit_line.html

@@ -0,0 +1,23 @@
+{% load i18n %}
+
+<div {% if not is_popup %}id="submit-row"{% endif %} class="relative lg:sticky lg:bottom-0 z-40">
+    <div class="backdrop-blur-xs bg-white/80 rounded-b-default pb-4 px-4 dark:bg-base-900/80 {% if not is_popup %}lg:border-t lg:border-base-200 relative lg:scrollable-top lg:py-0 dark:border-base-800{% endif %}">
+        <div class="flex flex-col-reverse gap-3 items-center mx-auto lg:flex-row-reverse container lg:h-[64px]">
+            {% if not revert_disabled %}
+                <button type="submit" form="{{ opts.model_name }}_form" class="bg-primary-600 block border border-transparent cursor-pointer font-medium px-3 py-2 rounded-default text-sm text-white w-full lg:w-auto"  name="_save" {{ onclick_attrib }}>
+                    {% trans 'Revert' %}
+                </button>
+            {% endif %}
+
+            {% if change_history %}
+                <button type="submit" form="{{ opts.model_name }}_form" class="bg-primary-600 block border border-transparent cursor-pointer font-medium px-3 py-2 rounded-default text-sm text-white w-full lg:w-auto"  name="_change_history" {{ onclick_attrib }}>
+                    {% trans 'Change History' %}
+                </button>
+            {% endif %}
+
+            <a href="{{ history_url }}" class="border border-base-200 font-medium mr-auto px-3 py-2 rounded-default text-sm text-base-500 text-center transition-all w-full hover:bg-base-50 lg:block lg:w-auto dark:border-base-700 dark:text-font-default-dark dark:hover:text-base-200 dark:hover:bg-base-900">
+                {% trans 'Close' %}
+            </a>
+        </div>
+    </div>
+</div>

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/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 = (
@@ -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"][

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/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

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/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)
 

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/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:

{django_unfold-0.59.0 → django_unfold-0.61.0}/src/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;