django-unfold 0.64.2__tar.gz → 0.66.0__tar.gz

{django_unfold-0.64.2 → django_unfold-0.66.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: django-unfold
-Version: 0.64.2
+Version: 0.66.0
 Summary: Modern Django admin theme for seamless interface development
 License: MIT
+License-File: LICENSE.md
 Keywords: django,admin,tailwind,theme
 Requires-Python: >=3.9
 Classifier: Environment :: Web Environment
@@ -17,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: django (>=4.2)
 Project-URL: Homepage, https://unfoldadmin.com
 Project-URL: Repository, https://github.com/unfoldadmin/django-unfold

{django_unfold-0.64.2 → django_unfold-0.66.0}/pyproject.toml

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

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/admin.py

@@ -63,30 +63,29 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     warn_unsaved_form = False
     checks_class = UnfoldModelAdminChecks
 
-    def changelist_view(
-        self, request: HttpRequest, extra_context: Optional[dict[str, str]] = None
-    ) -> TemplateResponse:
-        additional_media = forms.Media()
+    @property
+    def media(self):
+        if not hasattr(self, "request"):
+            return super().media
 
-        for filter in self.get_list_filter(request):
+        media = super().media
+
+        for filter in self.get_list_filter(self.request):
             if (
                 isinstance(filter, (tuple, list))
                 and hasattr(filter[1], "form_class")
                 and hasattr(filter[1].form_class, "Media")
             ):
-                additional_media += forms.Media(filter[1].form_class.Media)
+                media += forms.Media(filter[1].form_class.Media)
             elif hasattr(filter, "form_class") and hasattr(filter.form_class, "Media"):
-                additional_media += forms.Media(filter.form_class.Media)
+                media += forms.Media(filter.form_class.Media)
 
-        if not extra_context:
-            extra_context = {}
-
-        extra_context.update(
-            {
-                "media": self.media + additional_media,
-            }
-        )
+        return media
 
+    def changelist_view(
+        self, request: HttpRequest, extra_context: Optional[dict[str, str]] = None
+    ) -> TemplateResponse:
+        self.request = request
         return super().changelist_view(request, extra_context)
 
     def get_fieldsets(self, request: HttpRequest, obj=None) -> FieldsetsType:
@@ -193,7 +192,7 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
     ) -> dict[str, Any]:
         formset_kwargs = super().get_formset_kwargs(request, obj, inline, prefix)
 
-        if hasattr(inline, "per_page"):
+        if hasattr(inline, "per_page") and inline.per_page:
             formset_kwargs["request"] = request
             formset_kwargs["per_page"] = inline.per_page
 

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/contrib/constance/settings.py

@@ -15,6 +15,7 @@ UNFOLD_CONSTANCE_ADDITIONAL_FIELDS = {
         "django.forms.BooleanField",
         {
             "widget": "unfold.widgets.UnfoldBooleanSwitchWidget",
+            "required": False,
         },
     ],
     "file_field": [

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/contrib/constance/templates/admin/constance/change_list.html

@@ -22,30 +22,30 @@
                     {{ field }}
                 {% endfor %}
 
-                {% if fieldsets %}
-                    <div class="border border-base-200 rounded-default overflow-x-auto simplebar-horizontal-scrollbar-top dark:border-base-800" data-simplebar data-simplebar-auto-hide="false">
-                        <table class="w-full border-collapse">
+                <div class="border border-base-200 rounded-default overflow-x-auto simplebar-horizontal-scrollbar-top dark:border-base-800" data-simplebar data-simplebar-auto-hide="false">
+                    <table class="w-full border-collapse">
+                        {% if fieldsets %}
                             {% for fieldset in fieldsets %}
                                 {% with config_values=fieldset.config_values %}
                                     {% include "admin/constance/includes/results_list.html" %}
                                 {% endwith %}
                             {% endfor %}
+                        {% else %}
+                            {% include "admin/constance/includes/results_list.html" %}
+                        {% endif %}
 
-                            <tfoot>
-                                <tr>
-                                    <td class="border-t border-base-200 px-3 py-2 dark:border-base-800" colspan="100%">
-                                        <div class="flex justify-end">
-                                            {% trans "Save" as title %}
-                                            {% include "unfold/helpers/submit.html" with title=title %}
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tfoot>
-                        </table>
-                    </div>
-                {% else %}
-                    {% include "admin/constance/includes/results_list.html" %}
-                {% endif %}
+                        <tfoot>
+                            <tr>
+                                <td class="border-t border-base-200 px-3 py-2 dark:border-base-800" colspan="100%">
+                                    <div class="flex justify-end">
+                                        {% trans "Save" as title %}
+                                        {% include "unfold/helpers/submit.html" with title=title %}
+                                    </div>
+                                </td>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
             </form>
         </div>
     </div>

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/contrib/constance/templates/admin/constance/includes/results_list.html

@@ -1,19 +1,21 @@
 {% load admin_list static i18n %}
 
 <tbody {% if fieldset.collapse %} x-data="{ rowsOpen: false }" {% endif %}>
-    <tr {% if fieldset.collapse %} x-on:click="rowsOpen = !rowsOpen" {% endif %} class="{% if fieldset.collapse %}cursor-pointer{% endif %}">
-        <th class="bg-base-50 border-t border-base-200 font-semibold px-3 py-2 text-left text-font-important-light dark:text-font-important-dark dark:border-base-800 dark:bg-white/[.04] {% if forloop.first %}border-t-0{% endif %}" colspan="100%">
-            {{ fieldset.title }}
+    {% if fieldset.title %}
+        <tr {% if fieldset.collapse %} x-on:click="rowsOpen = !rowsOpen" {% endif %} class="{% if fieldset.collapse %}cursor-pointer{% endif %}">
+            <th class="bg-base-50 border-t border-base-200 font-semibold px-3 py-2 text-left text-font-important-light dark:text-font-important-dark dark:border-base-800 dark:bg-white/[.04] {% if forloop.first %}border-t-0{% endif %}" colspan="100%">
+                {{ fieldset.title }}
 
-            {% if fieldset.collapse %}
-                <span class="material-symbols-outlined float-right select-none transition-all" title="{% trans "Collapse" %}" x-bind:class="rowsOpen ? 'rotate-180' : ''">
-                    expand_more
-                </span>
-            {% endif %}
-        </th>
-    </tr>
+                {% if fieldset.collapse %}
+                    <span class="material-symbols-outlined float-right select-none transition-all" title="{% trans "Collapse" %}" x-bind:class="rowsOpen ? 'rotate-180' : ''">
+                        expand_more
+                    </span>
+                {% endif %}
+            </th>
+        </tr>
+    {% endif %}
 
-    <tr class="border-t border-base-200 dark:border-base-800 *:font-semibold *:px-3 *:py-2 *:text-left *:text-font-important-light dark:*:text-font-important-dark" {% if fieldset.collapse %}x-show="rowsOpen"{% endif %}>
+    <tr class="{% if fieldset.title %}border-t{% endif %} border-base-200 dark:border-base-800 *:font-semibold *:px-3 *:py-2 *:text-left *:text-font-important-light dark:*:text-font-important-dark" {% if fieldset.collapse %}x-show="rowsOpen"{% endif %}>
         <th>{% trans "Name" %}</th>
         <th>{% trans "Value" %}</th>
         <th>{% trans "Default" %}</th>

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/contrib/location_field/templates/location_field/map_widget.html

@@ -1,5 +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 id="map_{{ field_name }}" class="border gap-2 h-72 max-w-2xl rounded-default shadow-xs z-10"></div>
 </div>

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/dataclasses.py

@@ -39,3 +39,4 @@ class DropdownItem:
     title: str
     link: Union[str, Callable]
     icon: Optional[str] = None
+    attrs: Optional[dict] = None

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/mixins/base_model_admin.py

@@ -18,7 +18,7 @@ from unfold.overrides import FORMFIELD_OVERRIDES
 
 
 class BaseModelAdminMixin:
-    def __init__(self, model: models.Model, admin_site: AdminSite) -> None:
+    def __init__(self, model: type[models.Model], admin_site: AdminSite) -> None:
         overrides = copy.deepcopy(FORMFIELD_OVERRIDES)
 
         for k, v in self.formfield_overrides.items():

{django_unfold-0.64.2 → django_unfold-0.66.0}/src/unfold/sites.py

@@ -6,6 +6,7 @@ from urllib.parse import parse_qs, urlparse
 
 from django.contrib.admin import AdminSite
 from django.core.cache import cache
+from django.core.paginator import Paginator
 from django.core.validators import EMPTY_VALUES
 from django.http import HttpRequest, HttpResponse
 from django.template.response import TemplateResponse
@@ -209,12 +210,23 @@ class UnfoldAdminSite(AdminSite):
         return results
 
     def _search_models(
-        self, request: HttpRequest, app_list: list[dict[str, Any]], search_term: str
+        self,
+        request: HttpRequest,
+        app_list: list[dict[str, Any]],
+        search_term: str,
+        allowed_models: Optional[list[str]] = None,
     ) -> list[SearchResult]:
         results = []
 
         for app in app_list:
             for model in app["models"]:
+                # Skip models which are not allowed
+                if isinstance(allowed_models, (list, tuple)):
+                    if model["model"]._meta.label.lower() not in [
+                        m.lower() for m in allowed_models
+                    ]:
+                        continue
+
                 admin_instance = self._registry.get(model["model"])
                 search_fields = admin_instance.get_search_fields(request)
 
@@ -255,7 +267,8 @@ class UnfoldAdminSite(AdminSite):
     ) -> TemplateResponse:
         start_time = time.time()
 
-        CACHE_TIMEOUT = 10
+        CACHE_TIMEOUT = 5 * 60
+        PER_PAGE = 100
 
         search_term = request.GET.get("s")
         extended_search = "extended" in request.GET
@@ -276,33 +289,50 @@ class UnfoldAdminSite(AdminSite):
             results = cache_results
         else:
             results = self._search_apps(app_list, search_term)
-            search_models = self._get_config("COMMAND", request).get("search_models")
-            search_callback = self._get_config("COMMAND", request).get(
-                "search_callback"
-            )
 
             if extended_search:
-                if search_callback:
+                if search_callback := self._get_config("COMMAND", request).get(
+                    "search_callback"
+                ):
                     results.extend(
                         self._get_value(search_callback, request, search_term)
                     )
 
-                if search_models is True:
-                    results.extend(self._search_models(request, app_list, search_term))
+                search_models = self._get_value(
+                    self._get_config("COMMAND", request).get("search_models"), request
+                )
+
+                if search_models is True or isinstance(search_models, (list, tuple)):
+                    allowed_models = (
+                        search_models
+                        if isinstance(search_models, (list, tuple))
+                        else None
+                    )
+
+                    results.extend(
+                        self._search_models(
+                            request, app_list, search_term, allowed_models
+                        )
+                    )
 
             cache.set(cache_key, results, timeout=CACHE_TIMEOUT)
 
         execution_time = time.time() - start_time
+        paginator = Paginator(results, PER_PAGE)
+
+        show_history = self._get_value(
+            self._get_config("COMMAND", request).get("show_history"), request
+        )
 
         return TemplateResponse(
             request,
             template=template_name,
             context={
-                "results": results,
+                "page_obj": paginator,
+                "results": paginator.page(request.GET.get("page", 1)),
+                "page_counter": (int(request.GET.get("page", 1)) - 1) * PER_PAGE,
                 "execution_time": execution_time,
-                "command_show_history": self._get_config("COMMAND", request).get(
-                    "show_history"
-                ),
+                "command_show_history": show_history,
             },
             headers={
                 "HX-Trigger": "search",
@@ -356,11 +386,7 @@ class UnfoldAdminSite(AdminSite):
                 )
 
             # Checks if any tab item is active and then marks the sidebar link as active
-            if (
-                tabs
-                and self._get_is_tab_active(request, tabs, link)
-                and "active" not in item
-            ):
+            if tabs and self._get_is_tab_active(request, tabs, link):
                 item["active"] = True
 
             # Link callback
@@ -582,6 +608,7 @@ class UnfoldAdminSite(AdminSite):
                 title=item.get("title"),
                 link=self._get_value(item["link"], *args),
                 icon=item.get("icon"),
+                attrs=item.get("attrs"),
             )
             for item in items
         ]