django-unfold 0.63.0__tar.gz → 0.64.1__tar.gz

{django_unfold-0.63.0 → django_unfold-0.64.1}/PKG-INFO

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

{django_unfold-0.63.0 → django_unfold-0.64.1}/pyproject.toml

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

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/admin.py

@@ -129,7 +129,7 @@ class ModelAdmin(BaseModelAdminMixin, ActionModelAdminMixin, BaseModelAdmin):
 
         action_detail_urls = [
             path(
-                f"<path:object_id>/{action.path}/",
+                f"<path:object_id>/{action.path}",
                 wrap(action.method),
                 name=action.action_name,
             )

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/contrib/constance/templates/admin/constance/change_list.html

@@ -10,24 +10,6 @@
     <script type="text/javascript" src="{% static 'admin/js/constance.js' %}"></script>
 {% endblock %}
 
-{% block breadcrumbs %}
-    <div class="px-4">
-        <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex flex-wrap">
-                {% url 'admin:index' as link %}
-                {% trans 'Home' as name %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}
-
-                {% url 'admin:app_list' app_label=opts.app_label as link %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=opts.app_config.verbose_name %}
-
-                {% include 'unfold/helpers/breadcrumb_item.html' with link='' name=opts.verbose_name_plural|capfirst %}
-            </ul>
-        </div>
-    </div>
-{% endblock %}
-
-
 {% block content %}
     <div id="content-main" class="constance">
         <div id="changelist" class="flex flex-col gap-8 w-full">

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/contrib/filters/templates/unfold/filters/filters_numeric_slider.html

@@ -26,7 +26,7 @@
             </div>
         {% else %}
             <div class="admin-numeric-filter-slider-error dark:text-font-default-dark">
-                <p>
+                <p class="border border-base-300 border-dashed leading-[36px] h-[38px] rounded-default text-center dark:border-base-700">
                     {% trans 'Not enough data.' %}
                 </p>
             </div>

django_unfold-0.64.1/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage.html

@@ -0,0 +1,13 @@
+{% extends "admin/change_form.html" %}
+
+{% load admin_urls i18n guardian_tags  %}
+
+{% block content %}
+    {% include "unfold/guardian/user_form.html" %}
+
+    <hr class="border-base-200 my-12 dark:border-base-800"/>
+
+    {% include "unfold/guardian/group_form.html" %}
+{% endblock %}
+
+{% block footer %}{% endblock%}

django_unfold-0.64.1/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage_group.html

@@ -0,0 +1,31 @@
+{% extends "admin/change_form.html" %}
+{% load admin_urls i18n %}
+
+{% block extrahead %}{{ block.super }}
+    {{ form.media }}
+{% endblock %}
+
+{% block content %}
+    <div class="border border-base-200 overflow-hidden rounded-default p-3 shadow-xs dark:border-base-800">
+        <form method="post">
+            {% csrf_token %}
+
+            {% trans "Object" as title %}
+            {% include "unfold/helpers/field_readonly.html" with title=title value=object %}
+
+            {% trans "Group" as title %}
+            {% include "unfold/helpers/field_readonly.html" with title=title value=group_obj %}
+
+            {% include "unfold/helpers/field.html" with field=form.permissions %}
+
+            <div class="bg-base-50 border-t border-base-200 flex flex-row -m-3 p-3 dark:bg-white/[.02] dark:border-base-800">
+                <div class="ml-auto">
+                    {% trans "Save" as title %}
+                    {% include "unfold/helpers/submit.html" with title=title %}
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}
+
+{% block footer %}{% endblock%}

django_unfold-0.64.1/src/unfold/contrib/guardian/templates/admin/guardian/model/obj_perms_manage_user.html

@@ -0,0 +1,32 @@
+{% extends "admin/change_form.html" %}
+
+{% load admin_urls i18n %}
+
+{% block extrahead %}{{ block.super }}
+    {{ form.media }}
+{% endblock %}
+
+{% block content %}
+    <div class="border border-base-200 overflow-hidden rounded-default p-3 shadow-xs dark:border-base-800">
+        <form method="post">
+            {% csrf_token %}
+
+            {% trans "Object" as title %}
+            {% include "unfold/helpers/field_readonly.html" with title=title value=object %}
+
+            {% trans "User" as title %}
+            {% include "unfold/helpers/field_readonly.html" with title=title value=user_obj %}
+
+            {% include "unfold/helpers/field.html" with field=form.permissions %}
+
+            <div class="bg-base-50 border-t border-base-200 flex flex-row -m-3 p-3 dark:bg-white/[.02] dark:border-base-800">
+                <div class="ml-auto">
+                    {% trans "Save" as title %}
+                    {% include "unfold/helpers/submit.html" with title=title %}
+                </div>
+            </div>
+        </form>
+    </div>
+{% endblock %}
+
+{% block footer %}{% endblock%}

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/contrib/import_export/templates/admin/import_export/export.html

@@ -9,29 +9,6 @@
     {{ form.media }}
 {% endblock %}
 
-{% block breadcrumbs %}
-    <div class="px-4">
-        <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex flex-wrap">
-                {% url 'admin:index' as link %}
-                {% trans 'Home' as name %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}
-
-                {% url 'admin:app_list' app_label=opts.app_label as link %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=opts.app_config.verbose_name %}
-
-                {% url opts|admin_urlname:'changelist' as link %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=opts.verbose_name_plural|capfirst %}
-
-                {% include 'unfold/helpers/breadcrumb_item.html' with link='' name=cl.opts.verbose_name_plural|capfirst %}
-
-                {% trans 'Export' as name %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link='' name=name %}
-            </ul>
-        </div>
-    </div>
-{% endblock %}
-
 {% block content %}
     <form action="{{ export_url }}" method="POST">
         {% csrf_token %}

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/contrib/import_export/templates/admin/import_export/import.html

@@ -20,29 +20,6 @@
     {% endif %}
 {% endblock %}
 
-{% block breadcrumbs %}
-    <div class="px-4">
-        <div class="container mb-6 mx-auto -my-3 lg:mb-12">
-            <ul class="flex flex-wrap">
-                {% url 'admin:index' as link %}
-                {% trans 'Home' as name %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}
-
-                {% url 'admin:app_list' app_label=opts.app_label as link %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=opts.app_config.verbose_name %}
-
-                {% url opts|admin_urlname:'changelist' as link %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=opts.verbose_name_plural|capfirst %}
-
-                {% include 'unfold/helpers/breadcrumb_item.html' with link='' name=cl.opts.verbose_name_plural|capfirst %}
-
-                {% trans 'Import' as name %}
-                {% include 'unfold/helpers/breadcrumb_item.html' with link='' name=name %}
-            </ul>
-        </div>
-    </div>
-{% endblock %}
-
 {% block content %}
     {% if confirm_form %}
         {% include "admin/import_export/import_confirm.html" %}

django_unfold-0.64.1/src/unfold/contrib/simple_history/templates/simple_history/object_history_form.html

@@ -0,0 +1,23 @@
+{% extends "admin/change_form.html" %}
+
+{% load i18n %}
+
+{% block submit_buttons_top %}
+    {% include "simple_history/submit_line.html" %}
+{% endblock %}
+
+{% block submit_buttons_bottom %}
+    {% include "simple_history/submit_line.html" %}
+{% endblock %}
+
+{% block form_top %}
+    <p class="px-3 py-3 rounded-default text-sm last:mb-8 bg-blue-50 mb-8 text-blue-500 dark:bg-blue-500/20">
+        {% if not revert_disabled %}
+            {% blocktrans %}Press the 'Revert' button below to revert to this version of the object.{% endblocktrans %}
+        {% endif %}
+
+        {% if change_history %}
+            {% blocktrans %}Press the 'Change History' button below to edit the history.{% endblocktrans %}
+        {% endif %}
+    </p>
+{% endblock %}

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/contrib/simple_history/templates/simple_history/object_history_list.html

@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from simple_history_compat %}
 {% load admin_urls %}
 {% load getattribute from getattributes %}
 

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/dataclasses.py

@@ -18,6 +18,14 @@ class UnfoldAction:
     variant: Optional[ActionVariant] = ActionVariant.DEFAULT
 
 
+@dataclass
+class SearchResult:
+    title: str
+    description: str
+    link: str
+    icon: Optional[str]
+
+
 @dataclass
 class Favicon:
     href: Union[str, Callable]

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/settings.py

@@ -18,30 +18,30 @@ CONFIG_DEFAULTS = {
     "SHOW_BACK_BUTTON": False,
     "COLORS": {
         "base": {
-            "50": "249, 250, 251",
-            "100": "243, 244, 246",
-            "200": "229, 231, 235",
-            "300": "209, 213, 219",
-            "400": "156, 163, 175",
-            "500": "107, 114, 128",
-            "600": "75, 85, 99",
-            "700": "55, 65, 81",
-            "800": "31, 41, 55",
-            "900": "17, 24, 39",
-            "950": "3, 7, 18",
+            "50": "oklch(98.5% .002 247.839)",
+            "100": "oklch(96.7% .003 264.542)",
+            "200": "oklch(92.8% .006 264.531)",
+            "300": "oklch(87.2% .01 258.338)",
+            "400": "oklch(70.7% .022 261.325)",
+            "500": "oklch(55.1% .027 264.364)",
+            "600": "oklch(44.6% .03 256.802)",
+            "700": "oklch(37.3% .034 259.733)",
+            "800": "oklch(27.8% .033 256.848)",
+            "900": "oklch(21% .034 264.665)",
+            "950": "oklch(13% .028 261.692)",
         },
         "primary": {
-            "50": "250, 245, 255",
-            "100": "243, 232, 255",
-            "200": "233, 213, 255",
-            "300": "216, 180, 254",
-            "400": "192, 132, 252",
-            "500": "168, 85, 247",
-            "600": "147, 51, 234",
-            "700": "126, 34, 206",
-            "800": "107, 33, 168",
-            "900": "88, 28, 135",
-            "950": "59, 7, 100",
+            "50": "oklch(97.7% .014 308.299)",
+            "100": "oklch(94.6% .033 307.174)",
+            "200": "oklch(90.2% .063 306.703)",
+            "300": "oklch(82.7% .119 306.383)",
+            "400": "oklch(71.4% .203 305.504)",
+            "500": "oklch(62.7% .265 303.9)",
+            "600": "oklch(55.8% .288 302.321)",
+            "700": "oklch(49.6% .265 301.924)",
+            "800": "oklch(43.8% .218 303.724)",
+            "900": "oklch(38.1% .176 304.987)",
+            "950": "oklch(29.1% .149 302.717)",
         },
         "font": {
             "subtle-light": "var(--color-base-500)",  # text-base-500
@@ -64,8 +64,14 @@ CONFIG_DEFAULTS = {
         "action": None,
         "navigation": [],
     },
+    "COMMAND": {
+        "search_models": False,  # Enable search in the models
+        "show_history": False,  # Enable history in the command search
+        "search_callback": None,  # Inject a custom callback to the search form
+    },
     "SIDEBAR": {
         "show_search": False,
+        "command_search": False,
         "show_all_applications": False,
         "navigation": [],
     },

{django_unfold-0.63.0 → django_unfold-0.64.1}/src/unfold/sites.py

@@ -1,17 +1,20 @@
 import copy
+import time
 from http import HTTPStatus
 from typing import Any, Callable, Optional, Union
 from urllib.parse import parse_qs, urlparse
 
 from django.contrib.admin import AdminSite
+from django.core.cache import cache
 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.functional import lazy
 from django.utils.module_loading import import_string
+from django.utils.text import slugify
 
-from unfold.dataclasses import DropdownItem, Favicon
+from unfold.dataclasses import DropdownItem, Favicon, SearchResult
 
 try:
     from django.contrib.auth.decorators import login_not_required
@@ -22,7 +25,7 @@ except ImportError:
 
 
 from unfold.settings import get_config
-from unfold.utils import hex_to_rgb
+from unfold.utils import convert_color
 from unfold.widgets import (
     BUTTON_CLASSES,
     CHECKBOX_CLASSES,
@@ -112,6 +115,12 @@ class UnfoldAdminSite(AdminSite):
             "tab_list": self.get_tabs_list(request),
             "styles": self._get_list("STYLES", request),
             "scripts": self._get_list("SCRIPTS", request),
+            "command_show_history": self._get_config("COMMAND", request).get(
+                "show_history"
+            ),
+            "sidebar_command_search": self._get_config("SIDEBAR", request).get(
+                "command_search"
+            ),
             "sidebar_show_all_applications": self._get_value(
                 sidebar_config.get("show_all_applications"), request
             ),
@@ -165,26 +174,21 @@ class UnfoldAdminSite(AdminSite):
 
         return HttpResponse(status=HTTPStatus.OK)
 
-    def search(
-        self, request: HttpRequest, extra_context: Optional[dict[str, Any]] = None
-    ) -> TemplateResponse:
-        query = request.GET.get("s").lower()
-        app_list = super().get_app_list(request)
-        apps = []
+    def _search_apps(
+        self, app_list: list[dict[str, Any]], search_term: str
+    ) -> list[SearchResult]:
         results = []
-
-        if query in EMPTY_VALUES:
-            return HttpResponse()
+        apps = []
 
         for app in app_list:
-            if query in app["name"].lower():
+            if search_term in app["name"].lower():
                 apps.append(app)
                 continue
 
             models = []
 
             for model in app["models"]:
-                if query in model["name"].lower():
+                if search_term in model["name"].lower():
                     models.append(model)
 
             if len(models) > 0:
@@ -194,17 +198,111 @@ class UnfoldAdminSite(AdminSite):
         for app in apps:
             for model in app["models"]:
                 results.append(
-                    {
-                        "app": app,
-                        "model": model,
-                    }
+                    SearchResult(
+                        title=str(model["name"]),
+                        description=app["name"],
+                        link=model["admin_url"],
+                        icon="tag",
+                    )
+                )
+
+        return results
+
+    def _search_models(
+        self, request: HttpRequest, app_list: list[dict[str, Any]], search_term: str
+    ) -> list[SearchResult]:
+        results = []
+
+        for app in app_list:
+            for model in app["models"]:
+                admin_instance = self._registry.get(model["model"])
+                search_fields = admin_instance.get_search_fields(request)
+
+                if not search_fields:
+                    continue
+
+                pks = []
+
+                qs = admin_instance.get_queryset(request)
+                search_results, _has_duplicates = admin_instance.get_search_results(
+                    request, qs, search_term
                 )
 
+                for item in search_results:
+                    if item.pk in pks:
+                        continue
+
+                    pks.append(item.pk)
+
+                    link = reverse_lazy(
+                        f"{self.name}:{admin_instance.model._meta.app_label}_{admin_instance.model._meta.model_name}_change",
+                        args=(item.pk,),
+                    )
+
+                    results.append(
+                        SearchResult(
+                            title=str(item),
+                            description=f"{item._meta.app_label.capitalize()} - {item._meta.verbose_name.capitalize()}",
+                            link=link,
+                            icon="data_object",
+                        )
+                    )
+
+        return results
+
+    def search(
+        self, request: HttpRequest, extra_context: Optional[dict[str, Any]] = None
+    ) -> TemplateResponse:
+        start_time = time.time()
+
+        CACHE_TIMEOUT = 10
+
+        search_term = request.GET.get("s")
+        extended_search = "extended" in request.GET
+        app_list = super().get_app_list(request)
+        template_name = "unfold/helpers/search_results.html"
+
+        if search_term in EMPTY_VALUES:
+            return HttpResponse()
+
+        search_term = search_term.lower()
+        cache_key = f"unfold_search_{request.user.pk}_{slugify(search_term)}"
+        cache_results = cache.get(cache_key)
+
+        if extended_search:
+            template_name = "unfold/helpers/command_results.html"
+
+        if cache_results:
+            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:
+                    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))
+
+            cache.set(cache_key, results, timeout=CACHE_TIMEOUT)
+
+        execution_time = time.time() - start_time
+
         return TemplateResponse(
             request,
-            template="unfold/helpers/search_results.html",
+            template=template_name,
             context={
                 "results": results,
+                "execution_time": execution_time,
+                "command_show_history": self._get_config("COMMAND", request).get(
+                    "show_history"
+                ),
             },
             headers={
                 "HX-Trigger": "search",
@@ -260,8 +358,8 @@ class UnfoldAdminSite(AdminSite):
             # Checks if any tab item is active and then marks the sidebar link as active
             if (
                 tabs
-                and (is_active := self._get_is_tab_active(request, tabs, link))
-                and is_active
+                and self._get_is_tab_active(request, tabs, link)
+                and "active" not in item
             ):
                 item["active"] = True
 
@@ -408,7 +506,7 @@ class UnfoldAdminSite(AdminSite):
                     request, tab_item.get("link_callback") or tab_item["link"]
                 ):
                     has_tab_link_active = True
-                    break
+                    continue
 
             if has_primary_link and has_tab_link_active:
                 return True
@@ -440,33 +538,12 @@ class UnfoldAdminSite(AdminSite):
     def _get_colors(self, key: str, *args) -> dict[str, dict[str, str]]:
         colors = self._get_config(key, *args)
 
-        def rgb_to_values(value: str) -> str:
-            return ", ".join(
-                list(
-                    map(
-                        str.strip,
-                        value.removeprefix("rgb(").removesuffix(")").split(","),
-                    )
-                )
-            )
-
-        def hex_to_values(value: str) -> str:
-            return ", ".join(str(item) for item in hex_to_rgb(value))
-
         for name, weights in colors.items():
             weights = self._get_value(weights, *args)
             colors[name] = weights
 
             for weight, value in weights.items():
-                if value[0] == "#":
-                    colors[name][weight] = hex_to_values(value)
-                elif value.startswith("rgb"):
-                    colors[name][weight] = rgb_to_values(value)
-                elif isinstance(value, str) and all(
-                    part.isdigit() for part in value.split()
-                ):
-                    colors[name][weight] = ", ".join(value.split(" "))
-                pass
+                colors[name][weight] = convert_color(value)
 
         return colors