django-smartbase-admin 1.0.11__tar.gz → 1.0.13__tar.gz

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-smartbase-admin
-Version: 1.0.11
+Version: 1.0.13
 Summary: 
 Home-page: https://smartbase-sk.github.io/django-smartbase-admin-docs/
 License: MIT

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "1.0.11"
+version = "1.0.13"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/src/django_smartbase_admin/admin/admin_base.py

@@ -990,23 +990,6 @@ class SBAdmin(
             self.set_generic_relation_from_parent(request, obj)
         super().save_model(request, obj, form, change)
 
-    def process_field_data(
-        self,
-        request,
-        field: SBAdminField,
-        obj_id: Any,
-        value: Any,
-        additional_data: dict[str, Any],
-    ) -> Any:
-        is_xlsx_export = request.request_data.action == Action.XLSX_EXPORT.value
-        if field.view_method:
-            value = field.view_method(obj_id, value, **additional_data)
-        if is_xlsx_export and getattr(field.xlsx_options, "python_formatter", None):
-            value = field.xlsx_options.python_formatter(obj_id, value)
-        elif field.python_formatter:
-            value = field.python_formatter(obj_id, value)
-        return value
-
 
 class SBAdminInline(
     SBAdminInlineAndAdminCommon, SBAdminBaseQuerysetMixin, SBAdminBaseView

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/src/django_smartbase_admin/admin/widgets.py

@@ -82,9 +82,10 @@ class SBAdminBaseWidget(ContextMixin):
                 )
             except:
                 pass
-            context["widget"]["attrs"][
-                "id"
-            ] = f"{modal_prefix}{opts.app_label}_{opts.model_name}_{context['widget']['attrs']['id']}"
+            widget_id = f"{modal_prefix}{opts.app_label}_{opts.model_name}_{context['widget']['attrs']['id']}"
+            context["widget"]["attrs"]["id"] = widget_id
+            # needed for BoundField.id_for_label to work correctly
+            self.attrs["id"] = widget_id
         return context
 
 

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/src/django_smartbase_admin/engine/actions.py

@@ -10,6 +10,7 @@ class SBAdminCustomAction(object):
     css_class = None
     no_params = False
     open_in_modal = False
+    open_in_new_tab = False
 
     def __init__(
         self,
@@ -24,6 +25,7 @@ class SBAdminCustomAction(object):
         group=None,
         sub_actions=None,
         icon=None,
+        open_in_new_tab=None,
     ) -> None:
         super().__init__()
         self.title = title
@@ -37,6 +39,7 @@ class SBAdminCustomAction(object):
         self.group = group
         self.sub_actions = sub_actions
         self.icon = icon
+        self.open_in_new_tab = open_in_new_tab
         self.resolve_url()
 
     def resolve_url(self):

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/src/django_smartbase_admin/engine/admin_base_view.py

@@ -2,7 +2,7 @@ import json
 import urllib.parse
 from collections import defaultdict
 from collections.abc import Iterable
-from typing import Any
+from typing import Any, TYPE_CHECKING
 
 from django.contrib import messages
 from django.contrib.admin.actions import delete_selected
@@ -11,6 +11,7 @@ from django.db.models import F
 from django.http import HttpResponse, Http404, JsonResponse
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
@@ -35,6 +36,7 @@ from django_smartbase_admin.engine.const import (
     TABLE_UPDATE_ROW_DATA_EVENT_NAME,
     SELECT_ALL_KEYWORD,
     IGNORE_LIST_SELECTION,
+    SUPPORTED_FILE_TYPE_ICONS,
 )
 from django_smartbase_admin.services.views import SBAdminViewService
 from django_smartbase_admin.services.xlsx_export import (
@@ -44,6 +46,9 @@ from django_smartbase_admin.services.xlsx_export import (
 )
 from django_smartbase_admin.utils import is_htmx_request, render_notifications, is_modal
 
+if TYPE_CHECKING:
+    from django_smartbase_admin.engine.field import SBAdminField
+
 SBADMIN_IS_MODAL_VAR = "sbadmin_is_modal"
 SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR = "sbadmin_parent_instance_field"
 SBADMIN_PARENT_INSTANCE_PK_VAR = "sbadmin_parent_instance_pk"
@@ -103,7 +108,7 @@ class SBAdminBaseView(object):
         return inner_view
 
     def process_actions(
-            self, request, actions: list[SBAdminCustomAction]
+        self, request, actions: list[SBAdminCustomAction]
     ) -> list[SBAdminCustomAction]:
         processed_actions = self.process_actions_permissions(request, actions)
         for processed_action in processed_actions:
@@ -120,7 +125,7 @@ class SBAdminBaseView(object):
         return processed_actions
 
     def process_actions_permissions(
-            self, request, actions: list[SBAdminCustomAction]
+        self, request, actions: list[SBAdminCustomAction]
     ) -> list[SBAdminCustomAction]:
         result = []
         for action in actions:
@@ -199,12 +204,12 @@ class SBAdminBaseView(object):
         }
 
     def get_sbadmin_detail_actions(
-            self, request, object_id: int | str | None = None
+        self, request, object_id: int | str | None = None
     ) -> Iterable[SBAdminCustomAction] | None:
         return self.sbadmin_detail_actions
 
     def get_global_context(
-            self, request, object_id: int | str | None = None
+        self, request, object_id: int | str | None = None
     ) -> dict[str, Any]:
         return {
             "view_id": self.get_id(),
@@ -216,7 +221,7 @@ class SBAdminBaseView(object):
             "detail_actions": self.get_sbadmin_detail_actions(request, object_id),
             SBADMIN_IS_MODAL_VAR: is_modal(request),
             SBADMIN_RELOAD_ON_SAVE_VAR: SBADMIN_RELOAD_ON_SAVE_VAR in request.GET
-                                        or SBADMIN_RELOAD_ON_SAVE_VAR in request.POST,
+            or SBADMIN_RELOAD_ON_SAVE_VAR in request.POST,
             "const": json.dumps(
                 {
                     "MULTISELECT_FILTER_MAX_CHOICES_SHOWN": MULTISELECT_FILTER_MAX_CHOICES_SHOWN,
@@ -225,6 +230,8 @@ class SBAdminBaseView(object):
                     "TABLE_RELOAD_DATA_EVENT_NAME": TABLE_RELOAD_DATA_EVENT_NAME,
                     "TABLE_UPDATE_ROW_DATA_EVENT_NAME": TABLE_UPDATE_ROW_DATA_EVENT_NAME,
                     "SELECT_ALL_KEYWORD": SELECT_ALL_KEYWORD,
+                    "SUPPORTED_FILE_TYPE_ICONS": SUPPORTED_FILE_TYPE_ICONS,
+                    "STATIC_BASE_PATH": static("sb_admin"),
                 }
             ),
         }
@@ -232,6 +239,23 @@ class SBAdminBaseView(object):
     def get_model_path(self) -> str:
         return SBAdminViewService.get_model_path(self.model)
 
+    def process_field_data(
+        self,
+        request,
+        field: "SBAdminField",
+        obj_id: Any,
+        value: Any,
+        additional_data: dict[str, Any],
+    ) -> Any:
+        is_xlsx_export = request.request_data.action == Action.XLSX_EXPORT.value
+        if field.view_method:
+            value = field.view_method(obj_id, value, **additional_data)
+        if is_xlsx_export and getattr(field.xlsx_options, "python_formatter", None):
+            value = field.xlsx_options.python_formatter(obj_id, value)
+        elif field.python_formatter:
+            value = field.python_formatter(obj_id, value)
+        return value
+
 
 class SBAdminBaseQuerysetMixin(object):
     def get_queryset(self, request=None):
@@ -298,8 +322,8 @@ class SBAdminBaseListView(SBAdminBaseView):
 
     def is_reorder_active(self, request) -> bool:
         return (
-                self.is_reorder_available(request)
-                and getattr(request, "reorder_active", False) == True
+            self.is_reorder_available(request)
+            and getattr(request, "reorder_active", False) == True
         )
 
     def is_reorder_available(self, request) -> str | None:
@@ -334,7 +358,7 @@ class SBAdminBaseListView(SBAdminBaseView):
             qs.filter(**{f"{pk_field}__in": item_ids}).update(
                 **{
                     self.sbadmin_list_reorder_field: F(self.sbadmin_list_reorder_field)
-                                                     + int(diff)
+                    + int(diff)
                 }
             )
         return JsonResponse({"message": request.POST})
@@ -514,7 +538,7 @@ class SBAdminBaseListView(SBAdminBaseView):
         return self.sbadmin_list_selection_actions
 
     def get_sbadmin_list_selection_actions_grouped(
-            self, request
+        self, request
     ) -> dict[str, list[SBAdminCustomAction]]:
         result = {}
         list_selection_actions = self.process_actions(
@@ -546,8 +570,8 @@ class SBAdminBaseListView(SBAdminBaseView):
     def action_bulk_delete(self, request, modifier):
         action = self.sbadmin_list_action_class(self, request)
         if (
-                request.request_data.request_method == "POST"
-                and request.headers.get("X-TabulatorRequest", None) == "true"
+            request.request_data.request_method == "POST"
+            and request.headers.get("X-TabulatorRequest", None) == "true"
         ):
             return redirect(
                 self.get_action_url("action_bulk_delete")
@@ -625,13 +649,13 @@ class SBAdminBaseListView(SBAdminBaseView):
         return redirect_to
 
     def action_list(
-            self,
-            request,
-            page_size=None,
-            tabulator_definition=None,
-            extra_context=None,
-            list_actions=None,
-            template=None,
+        self,
+        request,
+        page_size=None,
+        tabulator_definition=None,
+        extra_context=None,
+        list_actions=None,
+        template=None,
     ):
         action = self.sbadmin_list_action_class(
             self,
@@ -684,8 +708,8 @@ class SBAdminBaseListView(SBAdminBaseView):
             getattr(field, "filter_field", field): ""
             for field in list_fields
             if field in list_filter
-               or getattr(field, "name", None) in list_filter
-               or getattr(field, "filter_field", None) in list_filter
+            or getattr(field, "name", None) in list_filter
+            or getattr(field, "filter_field", None) in list_filter
         }
         url_params = None
         if base_filter:
@@ -760,7 +784,7 @@ class SBAdminBaseListView(SBAdminBaseView):
 
     def get_filters_version(self, request) -> FilterVersions:
         return (
-                self.filters_version or request.request_data.configuration.filters_version
+            self.filters_version or request.request_data.configuration.filters_version
         )
 
     def get_filters_template_name(self, request) -> str:

{django_smartbase_admin-1.0.11 → django_smartbase_admin-1.0.13}/src/django_smartbase_admin/engine/const.py

@@ -74,3 +74,4 @@ TRANSLATIONS_SELECTED_LANGUAGES = "translation_selected_languages"
 OVERRIDE_CONTENT_OF_NOTIFICATION = "override_notification_content"
 FIELDSET_HIDE_HEADER_CLASS = "hide-header"
 ROW_CLASS_FIELD = "get_sbadmin_row_class"
+SUPPORTED_FILE_TYPE_ICONS = ["doc", "docx", "csv", "xls", "xlsx", "pdf", "ppt", "zip"]