django-unfold 0.64.1__py3-none-any.whl → 0.65.0__py3-none-any.whl

unfold/templates/admin/change_form.html

@@ -52,8 +52,12 @@
                     <input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">
                 {% endif %}
 
-                {% include "unfold/helpers/messages/errornote.html" with errors=errors %}
-                {% include "unfold/helpers/messages/error.html" with errors=adminform.form.non_field_errors %}
+                {% if errors or adminform.form.non_field_errors %}
+                    <div class="flex flex-col gap-4 *:mb-0">
+                        {% include "unfold/helpers/messages/errornote.html" with errors=errors %}
+                        {% include "unfold/helpers/messages/error.html" with errors=adminform.form.non_field_errors %}
+                    </div>
+                {% endif %}
 
                 {% block field_sets %}
                     {% with has_conditional_display=adminform.model_admin.conditional_fields %}

unfold/templates/unfold/helpers/command.html

@@ -50,4 +50,5 @@
                 <div id="command-results-note"></div>
             </div>
         </div>
+    </div>
 {% endif %}

unfold/templates/unfold/helpers/header_back_button.html

@@ -2,7 +2,7 @@
 
 {% if show_back_button %}
     {% if object %}
-        {% url object|admin_object_app_url:"changelist" as changelist_url %}
+        {% admin_object_app_url object "changelist" as changelist_url %}
 
         <a href="{{ changelist_url }}" class="block h-[18px] mr-3" title="{% trans "Go back" %}">
             <span class="material-symbols-outlined">

unfold/templates/unfold/helpers/pagination_infinite.html

@@ -5,7 +5,7 @@
         {% trans "Previous" %}
     </a>
 
-    <a {% if cl.result_list|length %}href="{% infinite_paginator_url cl cl.page_num|add:1 %}"{% endif %} class="{% if cl.result_list|length %}hover:text-primary-600 dark:hover:text-primary-500{% endif %}">
+    <a {% if cl.result_list|length == cl.paginator.per_page %}href="{% infinite_paginator_url cl cl.page_num|add:1 %}"{% endif %} class="{% if cl.result_list|length and cl.result_list|length == cl.paginator.per_page %}hover:text-primary-600 dark:hover:text-primary-500{% endif %}">
         {% trans "Next" %}
     </a>
 </div>

unfold/templates/unfold/helpers/site_dropdown.html

@@ -3,7 +3,7 @@
 {% if site_dropdown %}
     <div class="absolute bg-white border border-base-200 flex flex-col left-3 py-1 rounded-default shadow-lg top-[73px] w-[264px] z-50 dark:bg-base-800 dark:border-base-700" x-cloak x-show="openDropdown" x-transition x-on:click.outside="openDropdown = false">
         {% for item in site_dropdown %}
-            <a href="{{ item.link }}" class="flex flex-row items-center gap-3 max-h-[30px] mx-1 px-2 py-2 rounded-default text-font-default-light dark:text-font-default-dark hover:bg-base-100 hover:text-font-important-light dark:hover:bg-base-700 dark:hover:text-font-important-dark">
+            <a href="{{ item.link }}" class="flex flex-row items-center gap-3 max-h-[30px] mx-1 px-2 py-2 rounded-default text-font-default-light dark:text-font-default-dark hover:bg-base-100 hover:text-font-important-light dark:hover:bg-base-700 dark:hover:text-font-important-dark" {% include "unfold/helpers/attrs.html" with attrs=item.attrs %}>
                 {% if item.icon %}
                     <span class="material-symbols-outlined">
                         {{ item.icon }}

unfold/templatetags/unfold.py

@@ -548,7 +548,7 @@ def changeform_data(adminform: AdminForm) -> str:
     return mark_safe(json.dumps(fields))
 
 
-@register.filter(takes_context=True)
+@register.filter
 def changeform_condition(field: BoundField) -> BoundField:
     if isinstance(field.field, dict):
         return field
@@ -611,11 +611,16 @@ def querystring_params(
 def header_title(context: RequestContext) -> str:
     parts = []
     opts = context.get("opts")
+    current_app = (
+        context.request.current_app
+        if hasattr(context.request, "current_app")
+        else "admin"
+    )
 
     if opts:
         parts.append(
             {
-                "link": reverse_lazy("admin:app_list", args=[opts.app_label]),
+                "link": reverse_lazy(f"{current_app}:app_list", args=[opts.app_label]),
                 "title": opts.app_config.verbose_name,
             }
         )
@@ -624,7 +629,7 @@ def header_title(context: RequestContext) -> str:
             parts.append(
                 {
                     "link": reverse_lazy(
-                        f"admin:{original._meta.app_label}_{original._meta.model_name}_changelist"
+                        f"{current_app}:{original._meta.app_label}_{original._meta.model_name}_changelist"
                     ),
                     "title": original._meta.verbose_name_plural,
                 }
@@ -633,7 +638,7 @@ def header_title(context: RequestContext) -> str:
             parts.append(
                 {
                     "link": reverse_lazy(
-                        f"admin:{original._meta.app_label}_{original._meta.model_name}_change",
+                        f"{current_app}:{original._meta.app_label}_{original._meta.model_name}_change",
                         args=[original.pk],
                     ),
                     "title": original,
@@ -643,7 +648,7 @@ def header_title(context: RequestContext) -> str:
             parts.append(
                 {
                     "link": reverse_lazy(
-                        f"admin:{object._meta.app_label}_{object._meta.model_name}_changelist"
+                        f"{current_app}:{object._meta.app_label}_{object._meta.model_name}_changelist"
                     ),
                     "title": object._meta.verbose_name_plural,
                 }
@@ -652,7 +657,7 @@ def header_title(context: RequestContext) -> str:
             parts.append(
                 {
                     "link": reverse_lazy(
-                        f"admin:{object._meta.app_label}_{object._meta.model_name}_change",
+                        f"{current_app}:{object._meta.app_label}_{object._meta.model_name}_change",
                         args=[object.pk],
                     ),
                     "title": object,
@@ -662,7 +667,7 @@ def header_title(context: RequestContext) -> str:
             parts.append(
                 {
                     "link": reverse_lazy(
-                        f"admin:{opts.app_label}_{opts.model_name}_changelist"
+                        f"{current_app}:{opts.app_label}_{opts.model_name}_changelist"
                     ),
                     "title": opts.verbose_name_plural,
                 }
@@ -670,7 +675,9 @@ def header_title(context: RequestContext) -> str:
     elif object := context.get("object"):
         parts.append(
             {
-                "link": reverse_lazy("admin:app_list", args=[object._meta.app_label]),
+                "link": reverse_lazy(
+                    f"{current_app}:app_list", args=[object._meta.app_label]
+                ),
                 "title": object._meta.app_label,
             }
         )
@@ -678,7 +685,7 @@ def header_title(context: RequestContext) -> str:
         parts.append(
             {
                 "link": reverse_lazy(
-                    f"admin:{object._meta.app_label}_{object._meta.model_name}_changelist",
+                    f"{current_app}:{object._meta.app_label}_{object._meta.model_name}_changelist",
                 ),
                 "title": object._meta.verbose_name_plural,
             }
@@ -687,7 +694,7 @@ def header_title(context: RequestContext) -> str:
         parts.append(
             {
                 "link": reverse_lazy(
-                    f"admin:{object._meta.app_label}_{object._meta.model_name}_change",
+                    f"{current_app}:{object._meta.app_label}_{object._meta.model_name}_change",
                     args=[object.pk],
                 ),
                 "title": object,
@@ -697,7 +704,7 @@ def header_title(context: RequestContext) -> str:
         parts.append(
             {
                 "link": reverse_lazy(
-                    "admin:app_list", args=[model_admin.model._meta.app_label]
+                    f"{current_app}:app_list", args=[model_admin.model._meta.app_label]
                 ),
                 "title": model_admin.model._meta.app_label,
             }
@@ -706,7 +713,7 @@ def header_title(context: RequestContext) -> str:
         parts.append(
             {
                 "link": reverse_lazy(
-                    f"admin:{model_admin.model._meta.app_label}_{model_admin.model._meta.model_name}_changelist",
+                    f"{current_app}:{model_admin.model._meta.app_label}_{model_admin.model._meta.model_name}_changelist",
                 ),
                 "title": model_admin.model._meta.verbose_name_plural,
             }
@@ -734,9 +741,15 @@ def header_title(context: RequestContext) -> str:
     )
 
 
-@register.filter
-def admin_object_app_url(object: Model, arg: str) -> str:
-    return f"admin:{object._meta.app_label}_{object._meta.model_name}_{arg}"
+@register.simple_tag(takes_context=True)
+def admin_object_app_url(context: RequestContext, object: Model, arg: str) -> str:
+    current_app = (
+        context.request.current_app
+        if hasattr(context.request, "current_app")
+        else "admin"
+    )
+
+    return f"{current_app}:{object._meta.app_label}_{object._meta.model_name}_{arg}"
 
 
 @register.filter

unfold/views.py

@@ -30,6 +30,8 @@ class UnfoldModelAdminViewMixin(PermissionRequiredMixin):
         super().__init__(**kwargs)
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
+        self.request.current_app = self.model_admin.admin_site.name
+
         if not hasattr(self, "model_admin"):
             raise UnfoldException(
                 "UnfoldModelAdminViewMixin was not provided with 'model_admin' argument"

unfold/widgets.py

@@ -87,6 +87,8 @@ BASE_CLASSES = [
     "dark:focus:group-[.errors]:outline-red-500",
     "dark:scheme-dark",
     "group-[.primary]:border-transparent",
+    "disabled:!bg-base-50",
+    "dark:disabled:!bg-base-800",
 ]
 
 BASE_INPUT_CLASSES = [