django-unfold 0.64.2__py3-none-any.whl → 0.66.0__py3-none-any.whl

unfold/templatetags/unfold.py

@@ -1,5 +1,5 @@
 import json
-from collections.abc import Mapping
+from collections.abc import Iterable, Mapping
 from typing import Any, Optional, Union
 
 from django import template
@@ -235,18 +235,24 @@ class RenderComponentNode(template.Node):
             name: var.resolve(context) for name, var in self.extra_context.items()
         }
 
-        values.update(
-            {
-                "children": self.nodelist.render(context),
-            }
-        )
-
         if "component_class" in values:
             values = ComponentRegistry.create_instance(
                 values["component_class"],
                 request=context.request if hasattr(context, "request") else None,
             ).get_context_data(**values)
 
+        context_copy = context.new()
+        context_copy.update(context.flatten())
+        context_copy.update(values)
+        children = self.nodelist.render(context_copy)
+
+        if len(children) > 0:
+            values.update(
+                {
+                    "children": children,
+                }
+            )
+
         if self.include_context:
             values.update(context.flatten())
 
@@ -548,7 +554,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
@@ -607,15 +613,51 @@ def querystring_params(
     return result.urlencode()
 
 
+@register.simple_tag(name="unfold_querystring", takes_context=True)
+def unfold_querystring(context, *args, **kwargs):
+    """
+    Duplicated querystring template tag from Django core to allow
+    it using in Django 4.x. Once 4.x is not supported, remove it.
+    """
+    if not args:
+        args = [context.request.GET]
+    params = QueryDict(mutable=True)
+    for d in [*args, kwargs]:
+        if not isinstance(d, Mapping):
+            raise TemplateSyntaxError(
+                "querystring requires mappings for positional arguments (got "
+                f"{d!r} instead)."
+            )
+        for key, value in d.items():
+            if not isinstance(key, str):
+                raise TemplateSyntaxError(
+                    f"querystring requires strings for mapping keys (got {key!r} "
+                    "instead)."
+                )
+            if value is None:
+                params.pop(key, None)
+            elif isinstance(value, Iterable) and not isinstance(value, str):
+                params.setlist(key, value)
+            else:
+                params[key] = value
+    query_string = params.urlencode() if params else ""
+    return f"?{query_string}"
+
+
 @register.simple_tag(takes_context=True)
 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 +666,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 +675,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 +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,
                 }
@@ -652,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,
@@ -662,7 +704,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 +712,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 +722,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 +731,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 +741,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 +750,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 +778,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 = [
@@ -252,9 +254,9 @@ SWITCH_CLASSES = [
     "transition-colors",
     "w-8",
     "min-w-8",
-    "focus:outline-2",
-    "focus:outline-offset-2",
-    "focus:outline-primary-600",
+    "disabled:cursor-not-allowed",
+    "disabled:opacity-50",
+    "focus:outline-none",
     "after:absolute",
     "after:bg-white",
     "after:content-['']",