django-smartbase-admin 0.2.74__py3-none-any.whl → 0.2.76__py3-none-any.whl

django_smartbase_admin/actions/admin_action_list.py

@@ -184,7 +184,9 @@ class SBAdminListAction(SBAdminAction):
         tabulator_definition["tableIdColumnName"] = id_column_name
         tabulator_definition["constants"] = constants
 
-        list_actions = self.list_actions or self.view._get_sbadmin_list_actions()
+        list_actions = self.list_actions or self.view._get_sbadmin_list_actions(
+            self.threadsafe_request
+        )
 
         context_data.update(
             {

django_smartbase_admin/engine/admin_base_view.py

@@ -184,10 +184,10 @@ class SBAdminBaseView(object):
             "initials": request.request_data.user.username[0],
         }
 
-    def get_sbadmin_detail_actions(self, object_id):
+    def get_sbadmin_detail_actions(self, request, object_id: int | str | None = None):
         return self.sbadmin_detail_actions
 
-    def get_global_context(self, request, object_id=None):
+    def get_global_context(self, request, object_id: int | str | None = None):
         return {
             "view_id": self.get_id(),
             "configuration": request.request_data.configuration,
@@ -195,7 +195,7 @@ class SBAdminBaseView(object):
             "DETAIL_STRUCTURE_RIGHT_CLASS": DETAIL_STRUCTURE_RIGHT_CLASS,
             "OVERRIDE_CONTENT_OF_NOTIFICATION": OVERRIDE_CONTENT_OF_NOTIFICATION,
             "username_data": self.get_username_data(request),
-            "detail_actions": self.get_sbadmin_detail_actions(object_id),
+            "detail_actions": self.get_sbadmin_detail_actions(request, object_id),
             "const": json.dumps(
                 {
                     "MULTISELECT_FILTER_MAX_CHOICES_SHOWN": MULTISELECT_FILTER_MAX_CHOICES_SHOWN,
@@ -326,27 +326,27 @@ class SBAdminBaseListView(SBAdminBaseView):
     def init_actions(self, request):
         if self.sbadmin_actions_initialized:
             return
-        self.process_actions(request, self.get_sbadmin_list_selection_actions())
+        self.process_actions(request, self.get_sbadmin_list_selection_actions(request))
         self.sbadmin_actions_initialized = True
 
     def init_view_dynamic(self, request, request_data=None, **kwargs):
         super().init_view_dynamic(request, request_data, **kwargs)
         self.init_fields_cache(
-            self.get_sbamin_list_display(request), request.request_data.configuration
+            self.get_sbadmin_list_display(request), request.request_data.configuration
         )
         self.init_actions(request)
 
-    def get_sbamin_list_display(self, request):
+    def get_sbadmin_list_display(self, request):
         return self.sbadmin_list_display or self.list_display
 
     def register_autocomplete_views(self, request):
         super().register_autocomplete_views(request)
         self.init_fields_cache(
-            self.get_sbamin_list_display(request),
+            self.get_sbadmin_list_display(request),
             request.request_data.configuration,
             force=True,
         )
-        for list_action in self.get_sbadmin_list_selection_actions():
+        for list_action in self.get_sbadmin_list_selection_actions(request):
             if isinstance(list_action, SBAdminFormViewAction):
                 form = list_action.target_view.form_class
                 form.view = self
@@ -355,7 +355,7 @@ class SBAdminBaseListView(SBAdminBaseView):
     def get_list_display(self, request):
         return [
             getattr(field, "name", field)
-            for field in self.get_sbamin_list_display(request)
+            for field in self.get_sbadmin_list_display(request)
         ]
 
     def get_search_fields(self, request):
@@ -447,8 +447,8 @@ class SBAdminBaseListView(SBAdminBaseView):
             )
         return tabulator_definition
 
-    def _get_sbadmin_list_actions(self):
-        list_actions = [*(self.get_sbadmin_list_actions() or [])]
+    def _get_sbadmin_list_actions(self, request):
+        list_actions = [*(self.get_sbadmin_list_actions(request) or [])]
         if self.is_reorder_available():
             list_actions = [
                 *list_actions,
@@ -461,7 +461,7 @@ class SBAdminBaseListView(SBAdminBaseView):
             ]
         return list_actions
 
-    def get_sbadmin_list_actions(self):
+    def get_sbadmin_list_actions(self, request):
         if not self.sbadmin_list_actions:
             self.sbadmin_list_actions = [
                 SBAdminCustomAction(
@@ -472,7 +472,7 @@ class SBAdminBaseListView(SBAdminBaseView):
             ]
         return self.sbadmin_list_actions
 
-    def get_sbadmin_list_selection_actions(self):
+    def get_sbadmin_list_selection_actions(self, request):
         if not self.sbadmin_list_selection_actions:
             self.sbadmin_list_selection_actions = [
                 SBAdminCustomAction(
@@ -492,7 +492,7 @@ class SBAdminBaseListView(SBAdminBaseView):
     def get_sbadmin_list_selection_actions_grouped(self, request):
         result = {}
         list_selection_actions = self.process_actions(
-            request, self.get_sbadmin_list_selection_actions()
+            request, self.get_sbadmin_list_selection_actions(request)
         )
         for action in list_selection_actions:
             if not result.get(action.group):
@@ -553,19 +553,20 @@ class SBAdminBaseListView(SBAdminBaseView):
         updated_configuration = None
         if request.request_data.request_method == "POST":
             if name:
-                updated_configuration, created = (
-                    SBAdminListViewConfiguration.objects.update_or_create(
-                        name=name,
-                        user_id=request.request_data.user.id,
-                        defaults={
-                            "url_params": request.request_data.request_post.get(
-                                URL_PARAMS_NAME
-                            ),
-                            "view": self.get_id(),
-                            "action": None,
-                            "modifier": None,
-                        },
-                    )
+                (
+                    updated_configuration,
+                    created,
+                ) = SBAdminListViewConfiguration.objects.update_or_create(
+                    name=name,
+                    user_id=request.request_data.user.id,
+                    defaults={
+                        "url_params": request.request_data.request_post.get(
+                            URL_PARAMS_NAME
+                        ),
+                        "view": self.get_id(),
+                        "action": None,
+                        "modifier": None,
+                    },
                 )
         if request.request_data.request_method == "DELETE":
             if name:
@@ -644,7 +645,7 @@ class SBAdminBaseListView(SBAdminBaseView):
         list_filter = self.get_sbadmin_list_filter(request) or []
         if not list_filter:
             return all_config
-        list_fields = self.get_sbamin_list_display(request) or []
+        list_fields = self.get_sbadmin_list_display(request) or []
         self.init_fields_cache(list_fields, request.request_data.configuration)
         base_filter = {
             getattr(field, "filter_field", field): ""

django_smartbase_admin/engine/field_formatter.py

@@ -1,8 +1,17 @@
+from enum import Enum
+
 from django.template.defaultfilters import date, time
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 
 
+class BadgeType(Enum):
+    SUCCESS = "positive"
+    NOTICE = "notice"
+    WARNING = "warning"
+    ERROR = "negative"
+
+
 def datetime_formatter(object_id, value):
     if value is None:
         return None
@@ -33,14 +42,14 @@ def boolean_formatter(object_id, value):
     return f'<span class="badge badge-simple badge-neutral">{_("No")}</span>'
 
 
-def format_array(value_list, separator=""):
+def format_array(value_list, separator="", badge_type: BadgeType = BadgeType.NOTICE):
     result = ""
     if not value_list:
         return result
     for value in value_list:
         if not value:
             continue
-        result += f'<span class="badge badge-simple badge-notice mr-4">{value}</span>{separator}'
+        result += f'<span class="badge badge-simple badge-{badge_type.value} mr-4">{value}</span>{separator}'
     return result
 
 

django_smartbase_admin/services/views.py

@@ -34,6 +34,7 @@ class SBAdminViewService(object):
 
     @classmethod
     def process_url_params(cls, view_id, url_params, filter_version):
+        url_params = url_params or {}
         filter_data = SBAdminViewService.process_filter_data_url(
             view_id=view_id,
             filter_data=url_params.get(FILTER_DATA_NAME, {}),

{django_smartbase_admin-0.2.74.dist-info → django_smartbase_admin-0.2.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 0.2.74
+Version: 0.2.76
 Summary: 
 Author: SmartBase
 Author-email: info@smartbase.sk

{django_smartbase_admin-0.2.74.dist-info → django_smartbase_admin-0.2.76.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_smartbase_admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_smartbase_admin/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_smartbase_admin/actions/admin_action_list.py,sha256=EWk0KTXDVVJDT8bh052xazukTpYFFOzrKTp36m1QNzE,19229
+django_smartbase_admin/actions/admin_action_list.py,sha256=PBkuzK7QXkOtPKfNmCi1HA-1-Evpxpulg1I5ezXiCa8,19274
 django_smartbase_admin/actions/advanced_filters.py,sha256=Vm8b6TAwNehR8INjolFG7pEYL4ADO7XUiVOWpb0btM0,13481
 django_smartbase_admin/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_smartbase_admin/admin/admin_base.py,sha256=9fN3c41fNkav7uQiGfEnJaiqYKfDk57VrlYgiN04DE8,40100
@@ -10,7 +10,7 @@ django_smartbase_admin/apps.py,sha256=3Wm88v1u-ejKVSRsdgsnOrjOfdlsp1qVULskabgH1i
 django_smartbase_admin/compilemessages.py,sha256=-_FEFQlOvE4L8UzSuUxSxZQjgGlwL9IZtmg59fW_kIQ,342
 django_smartbase_admin/engine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_smartbase_admin/engine/actions.py,sha256=n8PiG60Kj1ECHB4lfVH_jvHMyOjOZ-DvQfO9F2CuqW0,1733
-django_smartbase_admin/engine/admin_base_view.py,sha256=ni1UV_nc_oeccRhKi9nyy520QB18nhZnmmcdaAIE6Hs,28475
+django_smartbase_admin/engine/admin_base_view.py,sha256=EfoxYGaDNtUbr2vUnwvws2JWG2ipQDin9JQKPkDYt5g,28575
 django_smartbase_admin/engine/admin_entrypoint_view.py,sha256=jfMfcYPfdre2abHfC4KIxaP_epJFuCeTcujGhGd4Tl4,624
 django_smartbase_admin/engine/admin_view.py,sha256=9wGffahDR3IYmhL9ZbX8uitwGdXdw5DIL5GnWBawmJM,4238
 django_smartbase_admin/engine/configuration.py,sha256=P3iSiPm9QBl9etTDJIWzo7DzOBCryGwWtbF288PEtus,8120
@@ -18,7 +18,7 @@ django_smartbase_admin/engine/const.py,sha256=vU_XMy76BYiw1tu88lw8UDGk-cW5oo62gh
 django_smartbase_admin/engine/dashboard.py,sha256=wrvX0GI-SII2pG0DX8Kvy4JFaM6h8e6R7KSCFddFC64,23642
 django_smartbase_admin/engine/fake_inline.py,sha256=9C2_mltg2P9-xa3vuoo5X_RcFaCRpKGNSy7t1_iiasE,5802
 django_smartbase_admin/engine/field.py,sha256=BD_W0ekE5tQJxUGpUA8bo4ZyFk0u2F_6UTPH4drj0JU,10286
-django_smartbase_admin/engine/field_formatter.py,sha256=GzyvcBr8Cru34yMedd1GYOl2jTTopEGeSEhoM9_CfKQ,1754
+django_smartbase_admin/engine/field_formatter.py,sha256=eHbXEBwG8jBc9zKpDQ4T64N5J4afF0Cbb8RFeFfgQRg,1950
 django_smartbase_admin/engine/filter_widgets.py,sha256=lHPMilA2tjtwnwqPw2nUE39BL1Dx_v4HNKhmg6szHUY,23687
 django_smartbase_admin/engine/global_filter_form.py,sha256=jlj6e9VYWDPyUNjcgj3gTIkCZXO01NZOWAeU3jFtkoA,249
 django_smartbase_admin/engine/menu_item.py,sha256=rMJFG5xm1T0wF8lUmiAZHzKtt9C0LdbpRFvaP0PlngM,2936
@@ -42,7 +42,7 @@ django_smartbase_admin/services/configuration.py,sha256=POMI0htBqFS9ptPXMtOhIlIK
 django_smartbase_admin/services/data.py,sha256=o36B_H9RnBvaQz3Rs3NygY1hVTr6hc89M-RK1saRXzc,156
 django_smartbase_admin/services/thread_local.py,sha256=C3x7hPsKRCddr05RGiN0f6fcSQ8qsrYRdx9oeMHRovU,293
 django_smartbase_admin/services/translations.py,sha256=aiekREx8KQA9CQRmtkUcys4ICJERMrkxPnLysp0YXO8,5606
-django_smartbase_admin/services/views.py,sha256=oTZXHvZl-eGCaHRoQiEG-YLKAGGs3FcuVDZhdiuuv34,8953
+django_smartbase_admin/services/views.py,sha256=Drg5Y_sYyzVGEDjpT0e5bZAbylD_GdQMXKApxEr31cg,8991
 django_smartbase_admin/services/xlsx_export.py,sha256=fnIqahmZR6G5T5wSH-sXhhLSy1QD3A-OY6BAn1WLLOc,10723
 django_smartbase_admin/static/sb_admin/build/postcss.config.js,sha256=JlIB66vejH4YA3sPp7hDjimQXAGz5WlVhFDwjBDNTEo,610
 django_smartbase_admin/static/sb_admin/build/tailwind.config.js,sha256=5q5CGlXyn5s3hB6k2OCTu4auVcY4_yop5TrM5g0pT80,2369
@@ -658,7 +658,7 @@ django_smartbase_admin/views/dashboard_view.py,sha256=vtz5emYTQ5WDFeLA8HrcmjSOVd
 django_smartbase_admin/views/global_filter_view.py,sha256=eYo1moJGyi7jc2cPDA5ZBiEgA7Hmc-DxbQvbqUpDkg8,1127
 django_smartbase_admin/views/media_view.py,sha256=5BLWXuzynF7nM34t-mf2BQSRN5ojY8HxpLIqt7Jiq9g,292
 django_smartbase_admin/views/translations_view.py,sha256=A02q1t13akLKd2Pg_ej4tVi5qPUKYxB2LqsBbYXM0l8,20267
-django_smartbase_admin-0.2.74.dist-info/LICENSE.md,sha256=okRGMBOYvyhprt2eTpX_QXqpzC0MODF-U7zX-4fKPjQ,1078
-django_smartbase_admin-0.2.74.dist-info/METADATA,sha256=iqrHWxzbyeBME7JNoGboxqWBnJX5U7EyyMCWhQ36bbk,945
-django_smartbase_admin-0.2.74.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-django_smartbase_admin-0.2.74.dist-info/RECORD,,
+django_smartbase_admin-0.2.76.dist-info/LICENSE.md,sha256=okRGMBOYvyhprt2eTpX_QXqpzC0MODF-U7zX-4fKPjQ,1078
+django_smartbase_admin-0.2.76.dist-info/METADATA,sha256=p7yKt3m3ia1-4YILAfw3838yhaPSJgrNZfwtUhJfOsI,945
+django_smartbase_admin-0.2.76.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+django_smartbase_admin-0.2.76.dist-info/RECORD,,