django-unfold 0.30.0__py3-none-any.whl → 0.32.0__py3-none-any.whl

unfold/admin.py

@@ -1,6 +1,6 @@
 import copy
 from functools import update_wrapper
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 from django import forms
 from django.contrib.admin import ModelAdmin as BaseModelAdmin
@@ -148,6 +148,7 @@ class ModelAdminMixin:
             else:
                 kwargs["widget"] = UnfoldAdminSelectWidget()
 
+        if "choices" not in kwargs:
             kwargs["choices"] = db_field.get_choices(
                 include_blank=db_field.blank, blank_choice=[("", _("Select value"))]
             )
@@ -229,6 +230,7 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
     add_fieldsets = ()
     list_horizontal_scrollbar_top = False
     list_filter_submit = False
+    list_fullwidth = False
     compressed_fields = False
     readonly_preprocess_fields = {}
     checks_class = UnfoldModelAdminChecks
@@ -255,7 +257,10 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
         return super().get_fieldsets(request, obj)
 
     def _filter_unfold_actions_by_permissions(
-        self, request: HttpRequest, actions: List[UnfoldAction]
+        self,
+        request: HttpRequest,
+        actions: List[UnfoldAction],
+        object_id: Optional[Union[int, str]] = None,
     ) -> List[UnfoldAction]:
         """Filter out any Unfold actions that the user doesn't have access to."""
         filtered_actions = []
@@ -263,12 +268,22 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
             if not hasattr(action.method, "allowed_permissions"):
                 filtered_actions.append(action)
                 continue
+
             permission_checks = (
                 getattr(self, f"has_{permission}_permission")
                 for permission in action.method.allowed_permissions
             )
-            if any(has_permission(request) for has_permission in permission_checks):
-                filtered_actions.append(action)
+
+            if object_id:
+                if any(
+                    has_permission(request, object_id)
+                    for has_permission in permission_checks
+                ):
+                    filtered_actions.append(action)
+            else:
+                if any(has_permission(request) for has_permission in permission_checks):
+                    filtered_actions.append(action)
+
         return filtered_actions
 
     def get_actions_list(self, request: HttpRequest) -> List[UnfoldAction]:
@@ -282,9 +297,11 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
         """
         return [self.get_unfold_action(action) for action in self.actions_list or []]
 
-    def get_actions_detail(self, request: HttpRequest) -> List[UnfoldAction]:
+    def get_actions_detail(
+        self, request: HttpRequest, object_id: int
+    ) -> List[UnfoldAction]:
         return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_detail()
+            request, self._get_base_actions_detail(), object_id
         )
 
     def _get_base_actions_detail(self) -> List[UnfoldAction]:
@@ -304,9 +321,11 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
         """
         return [self.get_unfold_action(action) for action in self.actions_row or []]
 
-    def get_actions_submit_line(self, request: HttpRequest) -> List[UnfoldAction]:
+    def get_actions_submit_line(
+        self, request: HttpRequest, object_id: int
+    ) -> List[UnfoldAction]:
         return self._filter_unfold_actions_by_permissions(
-            request, self._get_base_actions_submit_line()
+            request, self._get_base_actions_submit_line(), object_id
         )
 
     def _get_base_actions_submit_line(self) -> List[UnfoldAction]:
@@ -404,7 +423,7 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
 
         actions = []
         if object_id:
-            for action in self.get_actions_detail(request):
+            for action in self.get_actions_detail(request, object_id):
                 actions.append(
                     {
                         "title": action.description,
@@ -418,7 +437,7 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
 
         extra_context.update(
             {
-                "actions_submit_line": self.get_actions_submit_line(request),
+                "actions_submit_line": self.get_actions_submit_line(request, object_id),
                 "actions_detail": actions,
             }
         )
@@ -485,7 +504,7 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
     ) -> None:
         super().save_model(request, obj, form, change)
 
-        for action in self.get_actions_submit_line(request):
+        for action in self.get_actions_submit_line(request, obj.pk):
             if action.action_name not in request.POST:
                 continue
 

unfold/contrib/filters/templates/unfold/filters/filters_numeric_slider.html

@@ -9,11 +9,11 @@
 
         {% if choice.min is not None and choice.max is not None and choice.step %}
             <div class="admin-numeric-filter-slider-tooltips">
-                <span class="admin-numeric-filter-slider-tooltip-from border cursor-not-allowed flex flex-grow flex-row items-center mr-auto rounded-md shadow-sm px-3 py-2 w-full dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+                <span class="admin-numeric-filter-slider-tooltip-from border cursor-not-allowed flex flex-grow flex-row items-center mr-auto rounded-md shadow-sm px-3 py-2 w-full dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
                     {{ choice.value_from }}
                 </span>
 
-                <span class="admin-numeric-filter-slider-tooltip-to border cursor-not-allowed flex flex-grow flex-row items-center rounded-md shadow-sm px-3 py-2 w-full dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+                <span class="admin-numeric-filter-slider-tooltip-to border cursor-not-allowed flex flex-grow flex-row items-center rounded-md shadow-sm px-3 py-2 w-full dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
                     {{ choice.value_to }}
                 </span>
             </div>
@@ -25,7 +25,7 @@
                 {{ choice.form.as_p }}
             </div>
         {% else %}
-            <div class="admin-numeric-filter-slider-error dark:text-gray-400">
+            <div class="admin-numeric-filter-slider-error dark:text-gray-300">
                 <p>
                     {% trans 'Not enough data.' %}
                 </p>

unfold/contrib/forms/templates/unfold/forms/array.html

@@ -15,7 +15,9 @@
 
     <template x-for="(item, index) in items" :key="item.key">
         <div class="flex flex-row">
-            {% include template.template_name with widget=template %}
+            {% with widget=template %}
+                {% include template.template_name %}
+            {% endwith %}
 
             <a x-on:click="items.splice(index, 1)" class="bg-white border cursor-pointer flex items-center h-9.5 justify-center ml-2 rounded shadow-sm shrink-0 text-red-600 text-sm w-9.5 dark:bg-gray-900 dark:border-gray-700 dark:text-red-500">
                 <span class="material-symbols-outlined text-sm">delete</span>

unfold/contrib/forms/templates/unfold/forms/helpers/toolbar.html

@@ -2,7 +2,7 @@
 
 <template id="trix-toolbar">
     <div class="bg-gray-50 flex flex-row flex-wrap border group-[.errors]:border-t-red-600 gap-4 group-[.errors]:border-x-red-600 px-3 py-2 relative rounded-t-md shadow-sm w-full dark:bg-white/[.02] dark:border-gray-700 dark:group-[.errors]:border-t-red-500 dark:group-[.errors]:border-x-red-500">
-        <div data-trix-button-group="text-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm shrink-0 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+        <div data-trix-button-group="text-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm shrink-0 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
             {% spaceless %}
                 <button type="button" data-trix-attribute="p" data-trix-key="p" title="{% trans "Paragraph" %}" tabindex="-1" class="border-r cursor-pointer flex items-center h-8 justify-center transition-colors w-8 hover:text-primary-600 dark:border-gray-700">
                     <span class="material-symbols-outlined">format_paragraph</span>
@@ -30,7 +30,7 @@
             {% endspaceless %}
         </div>
 
-        <div data-trix-button-group="block-headings" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+        <div data-trix-button-group="block-headings" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
             {% spaceless %}
                 <button type="button" data-trix-attribute="heading1" title="{% trans "Heading" %} 1" tabindex="-1" class="border-r cursor-pointer flex items-center h-8 justify-center transition-colors w-8 hover:text-primary-600 dark:border-gray-700">
                     <span class="material-symbols-outlined">format_h1</span>
@@ -50,7 +50,7 @@
             {% endspaceless %}
         </div>
 
-        <div data-trix-button-group="block-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+        <div data-trix-button-group="block-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
             {% spaceless %}
                 <button type="button" data-trix-attribute="quote" title="{% trans "Quote" %}" tabindex="-1" class="border-r cursor-pointer flex items-center h-8 justify-center transition-colors w-8 hover:text-primary-600 dark:border-gray-700">
                     <span class="material-symbols-outlined">format_quote</span>
@@ -79,7 +79,7 @@
         </div>
 
         <div class="lg:ml-auto">
-            <div data-trix-button-group="history-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+            <div data-trix-button-group="history-tools" class="bg-white border border-md flex flex-row rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
                 <button type="button" data-trix-action="undo" data-trix-key="z" title="{% trans "Undo" %}" tabindex="-1" class="border-r cursor-pointer flex items-center h-8 justify-center transition-colors w-8 hover:text-primary-600 dark:border-gray-700">
                     <span class="material-symbols-outlined">undo</span>
                 </button>
@@ -92,9 +92,9 @@
             <div data-trix-dialogs>
                 <div class="absolute bg-white border-b -bottom-px left-0 px-4 py-2 right-0 shadow-sm translate-y-full dark:bg-gray-900 dark:border-gray-700" data-trix-dialog="href" data-trix-dialog-attribute="href">
                     <div class="flex flex-row">
-                        <input type="url" name="href" class="border bg-white font-medium px-3 rounded-md shadow-sm text-gray-500 text-sm focus:ring focus:ring-primary-300 focus:border-primary-600 focus:outline-none group-[.errors]:border-red-600 group-[.errors]:focus:ring-red-200 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400 dark:focus:ring-primary-600/30 dark:group-[.errors]:border-red-500 dark:group-[.errors]:focus:ring-red-600/40" placeholder="{% trans "Enter an URL" %}" required data-trix-input>
+                        <input type="url" name="href" class="border bg-white font-medium px-3 rounded-md shadow-sm text-gray-500 text-sm focus:ring focus:ring-primary-300 focus:border-primary-600 focus:outline-none group-[.errors]:border-red-600 group-[.errors]:focus:ring-red-200 dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300 dark:focus:ring-primary-600/30 dark:group-[.errors]:border-red-500 dark:group-[.errors]:focus:ring-red-600/40" placeholder="{% trans "Enter an URL" %}" required data-trix-input>
 
-                        <div class="bg-white border border-md flex flex-row ml-4 rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-400">
+                        <div class="bg-white border border-md flex flex-row ml-4 rounded-md shadow-sm dark:bg-gray-900 dark:border-gray-700 dark:text-gray-300">
                             <button type="button" data-trix-method="setAttribute" title="{% trans "Link" %}" class="border-r cursor-pointer flex items-center h-8 justify-center text-gray-400 transition-colors w-8 hover:text-primary-600 dark:border-gray-700">
                                 <span class="material-symbols-outlined">link</span>
                             </button>

unfold/contrib/forms/templates/unfold/forms/wysiwyg.html

@@ -1,6 +1,6 @@
 {% include "unfold/forms/helpers/toolbar.html" %}
 
-<input type="hidden" name="{{ widget.name }}" id="wysiwyg-{{ widget.name }}"{% if widget.value != None %} value="{{ widget.value }}"{% endif %}>
+<input type="hidden" name="{{ widget.name }}" id="wysiwyg-{{ widget.name }}"{% if widget.value != None %} value="{{ widget.value }}"{% endif %} {% include "django/forms/widgets/attrs.html" %}>
 
 <div class="max-w-4xl relative">
     <trix-editor input="wysiwyg-{{ widget.name }}" {% include "django/forms/widgets/attrs.html" %}></trix-editor>

unfold/contrib/forms/widgets.py

@@ -4,7 +4,11 @@ from django.core.validators import EMPTY_VALUES
 from django.forms import MultiWidget, Widget
 from django.http import QueryDict
 from django.utils.datastructures import MultiValueDict
-from unfold.widgets import PROSE_CLASSES, UnfoldAdminTextInputWidget
+from unfold.widgets import (
+    PROSE_CLASSES,
+    UnfoldAdminSelectWidget,
+    UnfoldAdminTextInputWidget,
+)
 
 WYSIWYG_CLASSES = [
     *PROSE_CLASSES,
@@ -20,26 +24,33 @@ WYSIWYG_CLASSES = [
     "w-full",
     "focus:outline-none",
     "dark:border-gray-700",
-    "dark:text-gray-400",
+    "dark:text-gray-300",
     "dark:group-[.errors]:border-red-500",
 ]
 
 
 class ArrayWidget(MultiWidget):
     template_name = "unfold/forms/array.html"
-    widget_class = UnfoldAdminTextInputWidget
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        widgets = [self.widget_class]
+        if "choices" in kwargs:
+            self.choices = kwargs["choices"]
+
+        widgets = [self.get_widget_instance()]
         super().__init__(widgets)
 
+    def get_widget_instance(self) -> Any:
+        if hasattr(self, "choices"):
+            return UnfoldAdminSelectWidget(choices=self.choices)
+
+        return UnfoldAdminTextInputWidget()
+
     def get_context(self, name: str, value: str, attrs: Dict) -> Dict:
         self._resolve_widgets(value)
         context = super().get_context(name, value, attrs)
-        template_widget = UnfoldAdminTextInputWidget()
-        template_widget.name = name
-
-        context.update({"template": template_widget})
+        context.update(
+            {"template": self.get_widget_instance().get_context(name, "", {})["widget"]}
+        )
         return context
 
     def value_from_datadict(
@@ -71,12 +82,12 @@ class ArrayWidget(MultiWidget):
             value = []
 
         elif isinstance(value, List):
-            self.widgets = [self.widget_class for item in value]
+            self.widgets = [self.get_widget_instance() for item in value]
         else:
-            self.widgets = [self.widget_class for item in value.split(",")]
+            self.widgets = [self.get_widget_instance() for item in value.split(",")]
 
         self.widgets_names = ["" for i in range(len(self.widgets))]
-        self.widgets = [w() if isinstance(w, type) else w for w in self.widgets]
+        self.widgets = [w if isinstance(w, type) else w for w in self.widgets]
 
 
 class WysiwygWidget(Widget):

unfold/contrib/guardian/templates/unfold/guardian/group_form.html

@@ -8,7 +8,7 @@
     </h2>
 
     {% if groups_perms.items %}
-        <table id="group-permissions" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-400 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
+        <table id="group-permissions" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-300 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
             <thead class="hidden lg:table-header-group">
                 <tr>
                     <th class="align-middle font-medium px-3 py-2 text-left text-gray-400 text-sm">
@@ -30,14 +30,14 @@
             <tbody>
                 {% for group, group_perms in groups_perms.items %}
                     <tr class="block border mb-3 rounded-md shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-gray-800">
-                        <th class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "User" %}">
+                        <th class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "User" %}">
                             <span class="text-gray-700 dark:text-gray-200">
                                 {{ group }}
                             </span>
                         </th>
 
                         {% for perm in model_perms %}
-                            <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{{ perm.name }}">
+                            <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{{ perm.name }}">
                                 {% if perm.codename in group_perms %}
                                     {% include "unfold/helpers/boolean.html" with value=False %}
                                 {% else %}
@@ -46,7 +46,7 @@
                             </td>
                         {% endfor %}
 
-                        <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-right text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "Action" %}">
+                        <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-right text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "Action" %}">
                             <a href="group-manage/{{ group.id|safe }}/" class="hover:text-gray-700 dark:hover:text-white">
                                 {% trans "Edit" %}
                             </a>

unfold/contrib/guardian/templates/unfold/guardian/user_form.html

@@ -8,7 +8,7 @@
     </h2>
 
     {% if users_perms.items %}
-        <table id="user-permissions" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-400 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
+        <table id="user-permissions" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-300 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
             <thead class="hidden lg:table-header-group">
                 <tr>
                     <th class="align-middle font-medium px-3 py-2 text-left text-gray-400 text-sm">
@@ -30,14 +30,14 @@
             <tbody>
                 {% for user, user_perms in users_perms.items %}
                     <tr class="block border mb-3 rounded-md shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-gray-800">
-                        <th class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "User" %}">
+                        <th class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "User" %}">
                             <span class="text-gray-700 dark:text-gray-200">
                                 {{ user }}
                             </span>
                         </th>
 
                         {% for perm in model_perms %}
-                            <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{{ perm.name }}">
+                            <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{{ perm.name }}">
                                 {% if perm.codename in group_perms %}
                                     {% include "unfold/helpers/boolean.html" with value=False %}
                                 {% else %}
@@ -46,7 +46,7 @@
                             </td>
                         {% endfor %}
 
-                        <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-right text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "Action" %}">
+                        <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-right text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans "Action" %}">
                             <a href="user-manage/{{ user.id|safe }}/" class="hover:text-gray-700 dark:hover:text-white">
                                 {% trans "Edit" %}
                             </a>

unfold/contrib/import_export/templates/admin/import_export/change_form.html

@@ -5,6 +5,6 @@
     {{ block.super }}
 
     {% if show_change_form_export %}
-        <input type="submit" value="{% translate 'Export' %}" name="_export-item" class="bg-white text-gray-500 border cursor-pointer flex font-medium items-center px-3 py-2 mr-3 rounded-md shadow-sm text-sm dark:bg-gray-900 dark:border dark:border-gray-700 dark:text-gray-400">
+        <input type="submit" value="{% translate 'Export' %}" name="_export-item" class="bg-white text-gray-500 border cursor-pointer flex font-medium items-center px-3 py-2 mr-3 rounded-md shadow-sm text-sm dark:bg-gray-900 dark:border dark:border-gray-700 dark:text-gray-300">
     {% endif %}
 {% endblock %}

unfold/contrib/import_export/templates/admin/import_export/import_errors.html

@@ -26,7 +26,7 @@
                         </div>
                     </div>
 
-                    <div class="block border leading-relaxed rounded p-4 text-sm traceback dark:border-gray-800 dark:text-gray-400 " x-show="open">
+                    <div class="block border leading-relaxed rounded p-4 text-sm traceback dark:border-gray-800 dark:text-gray-300 " x-show="open">
                         {{ error.traceback|linebreaks }}
                     </div>
                 </li>

unfold/contrib/import_export/templates/admin/import_export/import_preview.html

@@ -1,7 +1,7 @@
 {% load admin_urls i18n import_export_tags unfold %}
 
 {% block preview %}
-    <table class="border-gray-200 border-spacing-none border-separate text-gray-700 w-full dark:text-gray-400 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
+    <table class="border-gray-200 border-spacing-none border-separate text-gray-700 w-full dark:text-gray-300 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
         <thead class="hidden lg:table-header-group">
             <tr>
                 <th class="align-middle capitalize font-medium px-3 py-2 text-left text-gray-400 text-sm"></th>
@@ -17,7 +17,7 @@
         <tbody>
             {% for row in result.valid_rows %}
                 <tr class="{{ row.import_type }} {% cycle '' 'bg-gray-50 dark:bg-white/[.02]' %} block border mb-3 rounded-md shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-gray-800">
-                    <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-400 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
+                    <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
                         {% if row.import_type == 'new' %}
                             {% trans "New" %}
                         {% elif row.import_type == 'skip' %}
@@ -30,7 +30,7 @@
                     </td>
 
                     {% for field in row.diff %}
-                        <td data-label="{{ result.diff_headers|index:forloop.counter0 }}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-400 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
+                        <td data-label="{{ result.diff_headers|index:forloop.counter0 }}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
                             {{ field }}
                         </td>
                     {% endfor %}

unfold/contrib/import_export/templates/admin/import_export/import_validation.html

@@ -15,7 +15,7 @@
         </div>
     </div>
 
-    <table class="border-gray-200 border-spacing-none border-separate text-gray-700 w-full dark:text-gray-400 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
+    <table class="border-gray-200 border-spacing-none border-separate text-gray-700 w-full dark:text-gray-300 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
         <thead class="hidden lg:table-header-group">
             <tr>
                 <th class="align-middle capitalize font-medium px-3 py-2 text-left text-gray-400 text-sm">
@@ -37,11 +37,11 @@
         <tbody>
             {% for row in result.invalid_rows %}
                 <tr class="{% cycle '' 'bg-gray-50 dark:bg-white/[.02]' %} block border mb-3 rounded-md shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-gray-800">
-                    <td data-label="{% trans "Row" %}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-400 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
+                    <td data-label="{% trans "Row" %}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
                         {{ row.number }}
                     </td>
 
-                    <td data-label="{% trans "Errors" %}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-400 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
+                    <td data-label="{% trans "Errors" %}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
                         <div>
                             <span class="bg-red-600 font-semibold ml-2 px-1 rounded-sm text-xs text-white">{{ row.error_count }}</span>
                         </div>
@@ -77,7 +77,7 @@
                     </td>
 
                     {% for field in row.values %}
-                        <td data-label="{{ result.diff_headers|index:forloop.counter0 }}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-400 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
+                        <td data-label="{{ result.diff_headers|index:forloop.counter0 }}" class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:block before:capitalize before:content-[attr(data-label)] before:mr-auto before:text-gray-500 dark:before:text-gray-300 lg:before:hidden lg:py-3 lg:table-cell dark:border-gray-800">
                             {{ field }}
                         </td>
                     {% endfor %}

unfold/contrib/inlines/forms.py

@@ -12,9 +12,8 @@ class NonrelatedInlineModelFormSet(BaseModelFormSet):
         **kwargs: Any,
     ) -> None:
         self.instance = instance
-        self.queryset = self.provided_queryset
-
         super().__init__(**kwargs)
+        self.queryset = self.provided_queryset
 
     @classmethod
     def get_default_prefix(cls: BaseModelFormSet) -> str:

unfold/contrib/simple_history/templates/simple_history/object_history_list.html

@@ -3,7 +3,7 @@
 {% load admin_urls %}
 {% load getattribute from getattributes %}
 
-<table id="change-history" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-400 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
+<table id="change-history" class="border-gray-200 border-spacing-none border-separate mb-6 text-gray-700 w-full dark:text-gray-300 lg:border lg:rounded-md lg:shadow-sm lg:dark:border-gray-800">
     <thead class="hidden lg:table-header-group">
         <tr>
             <th class="align-middle font-medium px-3 py-2 text-left text-gray-400 text-sm">
@@ -41,27 +41,27 @@
     <tbody>
         {% for record in historical_records %}
             <tr class="block border mb-3 rounded-md shadow-sm lg:table-row lg:border-none lg:mb-0 lg:shadow-none dark:border-gray-800">
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Object' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Object' %}">
                     <a href="{% url opts|admin_urlname:'simple_history' object.pk record.pk %}">
                         {{ record.history_object }}
                     </a>
                 </td>
 
                 {% for column in history_list_display %}
-                    <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans column %}">
+                    <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans column %}">
                         {{ record|getattribute:column }}
                     </th>
                 {% endfor %}
 
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Date/time' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Date/time' %}">
                     {{ record.history_date }}
                 </td>
 
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Comment' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Comment' %}">
                     {{ record.get_history_type_display }}
                 </td>
 
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Changed by' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Changed by' %}">
                     {% if record.history_user %}
                         {% url admin_user_view record.history_user_id as admin_user_url %}
 
@@ -75,11 +75,11 @@
                     {% endif %}
                 </td>
 
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Change reason' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Change reason' %}">
                     {{ record.history_change_reason }}
                 </td>
 
-                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-400 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Changes' %}">
+                <td class="align-middle flex border-t border-gray-200 font-normal px-3 py-2 text-left text-sm before:flex before:capitalize before:content-[attr(data-label)] before:items-center before:mr-auto before:text-gray-500 first:border-t-0 dark:before:text-gray-300 lg:before:hidden lg:first:border-t lg:py-3 lg:table-cell dark:border-gray-800" data-label="{% trans 'Changes' %}">
                     {% block history_delta_changes %}
                         {% if record.history_delta_changes %}
                             <ul>
@@ -97,7 +97,7 @@
                                             {% endif %}
 
                                             {% if change.old and change.new %}
-                                                <span class="align-text-top material-symbols-outlined md-18 text-gray-300 group-hover:text-gray-400 dark:text-gray-600">arrow_right_alt</span>
+                                                <span class="align-text-top material-symbols-outlined md-18 text-gray-300 group-hover:text-gray-300 dark:text-gray-600">arrow_right_alt</span>
                                             {% endif %}
 
                                             {% if change.new %}

unfold/contrib/simple_history/templates/simple_history/submit_line.html

@@ -16,7 +16,7 @@
                     </button>
                 {% endif %}
 
-                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-gray-400 dark:hover:text-gray-200 dark:hover:bg-gray-900">
+                <a href="{{ history_url }}" class="border font-medium mr-auto px-3 py-2 rounded-md text-sm text-gray-500 text-center transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:text-gray-300 dark:hover:text-gray-200 dark:hover:bg-gray-900">
                     {% trans 'Close' %}
                 </a>
             </div>

unfold/dataclasses.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Dict, Optional
+from typing import Callable, Dict, Optional, Union
 
 from .typing import ActionFunction
 
@@ -11,3 +11,12 @@ class UnfoldAction:
     description: str
     path: str
     attrs: Optional[Dict] = None
+    object_id: Optional[Union[int, str]] = None
+
+
+@dataclass
+class Favicon:
+    href: Union[str, Callable]
+    rel: Optional[str] = None
+    type: Optional[str] = None
+    sizes: Optional[str] = None

unfold/fields.py

@@ -95,7 +95,7 @@ class UnfoldAdminReadonlyField(helpers.AdminReadonlyField):
                 current_app=self.model_admin.admin_site.name,
             )
             return format_html(
-                '<a href="{}" class="text-primary-600 underline whitespace-nowrap dark:text-primary-500">{}</a>',
+                '<a href="{}" class="text-primary-600 underline dark:text-primary-500">{}</a>',
                 url,
                 remote_obj,
             )

unfold/settings.py

@@ -7,6 +7,7 @@ CONFIG_DEFAULTS = {
     "SITE_ICON": None,
     "SITE_SYMBOL": None,
     "SITE_LOGO": None,
+    "SITE_FAVICONS": [],
     "SHOW_HISTORY": True,
     "SHOW_VIEW_ON_SITE": True,
     "COLORS": {