django-unfold 0.29.1__py3-none-any.whl → 0.31.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"))]
             )
@@ -227,7 +228,10 @@ class ModelAdmin(ModelAdminMixin, BaseModelAdmin):
     actions_submit_line = ()
     custom_urls = ()
     add_fieldsets = ()
+    list_horizontal_scrollbar_top = False
     list_filter_submit = False
+    list_fullwidth = False
+    compressed_fields = False
     readonly_preprocess_fields = {}
     checks_class = UnfoldModelAdminChecks
 
@@ -253,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 = []
@@ -261,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]:
@@ -280,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]:
@@ -302,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]:
@@ -402,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,
@@ -416,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,
             }
         )
@@ -483,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>