django-unfold 0.55.1__tar.gz → 0.55.3__tar.gz

{django_unfold-0.55.1 → django_unfold-0.55.3}/PKG-INFO

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

{django_unfold-0.55.1 → django_unfold-0.55.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-unfold"
-version = "0.55.1"
+version = "0.55.3"
 description = "Modern Django admin theme for seamless interface development"
 license = "MIT"
 readme = "README.md"

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/admin.py

@@ -9,6 +9,7 @@ from django.contrib.admin import display, helpers
 from django.db.models import BLANK_CHOICE_DASH, Model
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect
+from django.template.response import TemplateResponse
 from django.urls import URLPattern, path
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -56,12 +57,12 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     warn_unsaved_form = False
     checks_class = UnfoldModelAdminChecks
 
-    @property
-    def media(self):
-        media = super().media
+    def changelist_view(
+        self, request: HttpRequest, extra_context: Optional[dict[str, str]] = None
+    ) -> TemplateResponse:
         additional_media = forms.Media()
 
-        for filter in self.list_filter:
+        for filter in self.get_list_filter(request):
             if (
                 isinstance(filter, (tuple, list))
                 and hasattr(filter[1], "form_class")
@@ -71,7 +72,16 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
             elif hasattr(filter, "form_class") and hasattr(filter.form_class, "Media"):
                 additional_media += forms.Media(filter.form_class.Media)
 
-        return media + additional_media
+        if not extra_context:
+            extra_context = {}
+
+        extra_context.update(
+            {
+                "media": self.media + additional_media,
+            }
+        )
+
+        return super().changelist_view(request, extra_context)
 
     def get_fieldsets(self, request: HttpRequest, obj=None) -> FieldsetsType:
         if not obj and self.add_fieldsets:

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/contrib/filters/admin/choice_filters.py

@@ -22,7 +22,7 @@ class RadioFilter(admin.SimpleListFilter):
     all_option = ["", _("All")]
 
     def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
         choices = []
 
@@ -78,7 +78,7 @@ class BooleanRadioFilter(ValueMixin, admin.BooleanFieldListFilter):
     all_option = ["", _("All")]
 
     def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
 
         if add_facets:
@@ -119,7 +119,7 @@ class RelatedCheckboxFilter(MultiValueMixin, admin.RelatedFieldListFilter):
         return queryset
 
     def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
 
         if add_facets:
@@ -147,7 +147,7 @@ class AllValuesCheckboxFilter(MultiValueMixin, admin.AllValuesFieldListFilter):
     form_class = CheckboxForm
 
     def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
 
         if add_facets:

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/contrib/filters/admin/dropdown_filters.py

@@ -86,7 +86,7 @@ class RelatedDropdownFilter(ValueMixin, DropdownMixin, admin.RelatedFieldListFil
         self.request = request
 
     def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
 
         if add_facets:

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/contrib/filters/admin/mixins.py

@@ -55,7 +55,7 @@ class ChoicesMixin:
     template = "unfold/filters/filters_field.html"
 
     def choices(self, changelist: ChangeList) -> Generator[dict[str, Any], None, None]:
-        add_facets = changelist.add_facets
+        add_facets = getattr(changelist, "add_facets", False)
         facet_counts = self.get_facet_queryset(changelist) if add_facets else None
         choices = [self.all_option] if self.all_option else []
 

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/sites.py

@@ -82,9 +82,9 @@ class UnfoldAdminSite(AdminSite):
                 "switch": " ".join(SWITCH_CLASSES),
                 "file": " ".join(FILE_CLASSES),
             },
-            "site_title": self._get_config("SITE_TITLE", request) or self.site_title,
-            "site_header": self._get_config("SITE_HEADER", request) or self.site_header,
-            "site_url": self._get_config("SITE_URL", request) or self.site_url,
+            "site_title": self._get_config("SITE_TITLE", request),
+            "site_header": self._get_config("SITE_HEADER", request),
+            "site_url": self._get_config("SITE_URL", request),
             "site_subheader": self._get_config("SITE_SUBHEADER", request),
             "site_dropdown": self._get_site_dropdown_items("SITE_DROPDOWN", request),
             "site_logo": self._get_theme_images("SITE_LOGO", request),

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/templates/admin/edit_inline/stacked.html

@@ -1,6 +1,6 @@
 {% load admin_urls i18n unfold %}
 
-<div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-type="stacked" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}" {% if inline_admin_formset.opts.tab %}x-show="activeTab == '{{ inline_admin_formset.opts.verbose_name|slugify }}'"{% else %}x-show="activeTab == 'general'"{% endif %}>
+<div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-type="stacked" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}" {% if inline_admin_formset.opts.tab %}x-show="activeTab == '{{ inline_admin_formset.formset.prefix|slugify }}'"{% else %}x-show="activeTab == 'general'"{% endif %}>
     <fieldset class="module relative {{ inline_admin_formset.classes }}" aria-labelledby="{{ inline_admin_formset.formset.prefix }}-heading">
         {% if inline_admin_formset.is_collapsible %}<details><summary>{% endif %}
 

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/templates/admin/edit_inline/tabular.html

@@ -1,6 +1,6 @@
 {% load admin_modify admin_urls i18n static unfold %}
 
-<div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-type="tabular" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}" {% if inline_admin_formset.opts.tab %}x-show="activeTab == '{{ inline_admin_formset.opts.verbose_name|slugify }}'"{% else %}x-show="activeTab == 'general'"{% endif %}>
+<div class="js-inline-admin-formset inline-group" id="{{ inline_admin_formset.formset.prefix }}-group" data-inline-type="tabular" data-inline-formset="{{ inline_admin_formset.inline_formset_data }}" {% if inline_admin_formset.opts.tab %}x-show="activeTab == '{{ inline_admin_formset.formset.prefix|slugify }}'"{% else %}x-show="activeTab == 'general'"{% endif %}>
     <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
         {{ inline_admin_formset.formset.management_form }}
 

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/templates/admin/login.html

@@ -90,7 +90,9 @@
                 {% endif %}
 
                 {% if not theme %}
-                    {% include "unfold/helpers/theme_switch.html" %}
+                    <div class="ml-auto">
+                        {% include "unfold/helpers/theme_switch.html" %}
+                    </div>
                 {% endif %}
             </div>
         </div>

{django_unfold-0.55.1 → django_unfold-0.55.3}/src/unfold/templates/unfold/helpers/tab_items.html

@@ -5,11 +5,11 @@
         {% for item in tabs_list %}
             {% if item.has_permission %}
                 <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-base-800">
-                    <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}{% if item.inline %}#{{ item.inline }}{% endif %}"
+                    <a href="{% if item.link_callback %}{{ item.link_callback }}{% else %}{{ item.link }}{% endif %}{% if item.inline %}#{{ item.inline|slugify }}{% endif %}"
                        class="block px-3 py-2 md:py-4 md:px-0 dark:border-base-800 {% if item.active and not item.inline %} border-b font-semibold -mb-px text-primary-600 hover:text-primary-600 dark:text-primary-500 dark:hover:text-primary-500 md:border-primary-500 dark:md:!border-primary-600{% else %}font-medium hover:text-primary-600 dark:hover:text-primary-500{% endif %}"
                        {% if item.inline %}
-                           x-on:click="activeTab = '{{ item.inline }}'"
-                           x-bind:class="{'border-b border-base-200 dark:border-base-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ item.inline }}'}"
+                           x-on:click="activeTab = '{{ item.inline|slugify }}'"
+                           x-bind:class="{'border-b border-base-200 dark:border-base-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ item.inline|slugify }}'}"
                        {% endif %}
                     >
                         {{ item.title }}
@@ -31,9 +31,9 @@
             {% for inline in inlines_list %}
                 <li class="border-b last:border-b-0 md:border-b-0 md:mr-8 dark:border-base-800">
                     <a class="block cursor-pointer font-medium px-3 py-2 md:py-4 md:px-0"
-                       href="#{{ inline.opts.verbose_name|slugify }}"
-                       x-on:click="activeTab = '{{ inline.opts.verbose_name|slugify }}'"
-                       x-bind:class="{'border-b border-base-200 dark:border-base-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ inline.opts.verbose_name|slugify }}', 'hover:text-primary-600 dark:hover:text-primary-500 dark:border-base-800': activeTab != '{{ inline.opts.verbose_name|slugify }}'}">
+                       href="#{{ inline.formset.prefix|slugify }}"
+                       x-on:click="activeTab = '{{ inline.formset.prefix|slugify }}'"
+                       x-bind:class="{'border-b border-base-200 dark:border-base-800 md:border-primary-500 dark:md:!border-primary-600 font-semibold -mb-px text-primary-600 dark:text-primary-500': activeTab == '{{ inline.formset.prefix|slugify }}', 'hover:text-primary-600 dark:hover:text-primary-500 dark:border-base-800': activeTab != '{{ inline.formset.prefix|slugify }}'}">
                         {% if inline.formset.max_num == 1 %}
                             {{ inline.opts.verbose_name|capfirst }}
                         {% else %}