django-smartbase-admin 1.5.2__tar.gz → 2.0.0__tar.gz

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/PKG-INFO

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

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-smartbase-admin"
-version = "1.5.2"
+version = "2.0.0"
 description = ""
 authors = ["SmartBase <info@smartbase.sk>"]
 readme = "README.md"
@@ -9,6 +9,7 @@ homepage = "https://smartbase-sk.github.io/django-smartbase-admin-docs/"
 repository = "https://github.com/SmartBase-SK/django-smartbase-admin"
 include = [
     "**/static/sb_admin/dist/**/*",
+    "**/mcp/dashboard_blueprint.html",
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/actions/admin_action_list.py

@@ -4,7 +4,8 @@ import math
 from typing import Any, TYPE_CHECKING
 
 from django.contrib.admin.utils import lookup_spawns_duplicates
-from django.db.models import Q, Field
+from django.core.exceptions import FieldError
+from django.db.models import Avg, Count, Field, Max, Min, Q, Sum
 from django.utils import timezone
 from django.utils.html import escape
 from django.utils.safestring import SafeString
@@ -52,6 +53,15 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+# Whitelisted list aggregations: public name -> Django aggregate class.
+LIST_AGGREGATE_FUNCTIONS = {
+    "sum": Sum,
+    "avg": Avg,
+    "min": Min,
+    "max": Max,
+    "count": Count,
+}
+
 
 class SBAdminAction(object):
     view = None
@@ -223,7 +233,9 @@ class SBAdminListAction(SBAdminAction):
         context_data.update(
             {
                 "const": constants,
+                "media": self.view.get_list_view_media(self.threadsafe_request),
                 "tabulator_definition": tabulator_definition,
+                "tabulator_definition_script_id": f"{self.view.get_id()}-tabulator-definition",
                 "id_column_name": id_column_name,
                 "filters": self.get_filters(),
                 "advanced_filters_data": QueryBuilderService.get_advanced_filters_context_data(
@@ -665,9 +677,8 @@ class SBAdminListAction(SBAdminAction):
 
     def get_xlsx_data(self, request):
         page_size = XLSX_PAGE_CHUNK_SIZE
-        file_name = (
-            f'{self.view.get_menu_label()}__{timezone.now().strftime("%Y-%m-%d")}.xlsx'
-        )
+        file_name_label = self.view.get_menu_label() or getattr(self.view, "name", None)
+        file_name = f'{file_name_label}__{timezone.now().strftime("%Y-%m-%d")}.xlsx'
         columns = self.get_excel_columns()
         additional_filter = Q()
         if request.request_data.modifier != IGNORE_LIST_SELECTION:
@@ -700,3 +711,134 @@ class SBAdminListAction(SBAdminAction):
             else {}
         )
         return [file_name, data_list, columns, options]
+
+    def validate_aggregate(self, aggregate, field_map=None) -> list[dict]:
+        """Validate / normalize an ``aggregate`` request into specs.
+
+        ``aggregate`` is a list of ``{"fn", "field"}`` dicts. ``fn`` must be
+        a key of :data:`LIST_AGGREGATE_FUNCTIONS`; ``field`` must name a
+        declared :class:`SBAdminField` (``list_visible`` irrelevant), never
+        an arbitrary ORM path. ``count`` may omit ``field`` (row count);
+        ``sum/avg/min/max`` require a numeric field. Aliases are derived
+        (``f"{fn}_{field}"`` or ``"count"``) — no override is accepted.
+
+        Returns ``{"fn", "field", "alias", "sbfield", "multiplying"}`` specs;
+        raises ``ValueError`` / ``LookupError`` on any bad entry.
+        """
+        if field_map is None:
+            field_map = self.view.get_field_map(self.threadsafe_request)
+        if not isinstance(aggregate, list):
+            raise ValueError("aggregate must be a list of {'fn', 'field'} specs.")
+
+        specs: list[dict] = []
+        seen: set[str] = set()
+        for spec in aggregate:
+            if not isinstance(spec, dict):
+                raise ValueError(f"Each aggregate spec must be a dict, got {spec!r}.")
+            extra_keys = set(spec) - {"fn", "field"}
+            if extra_keys:
+                raise ValueError(
+                    f"Unsupported aggregate key(s) {sorted(extra_keys)}; only "
+                    "'fn' and 'field' are allowed (aliases are derived)."
+                )
+            fn = spec.get("fn")
+            if fn not in LIST_AGGREGATE_FUNCTIONS:
+                raise ValueError(
+                    f"Unknown aggregate fn {fn!r}; allowed: "
+                    f"{sorted(LIST_AGGREGATE_FUNCTIONS)}."
+                )
+            field_name = spec.get("field")
+            sbfield = None
+            if field_name is None:
+                if fn != "count":
+                    raise ValueError(f"{fn!r} aggregate requires a 'field'.")
+                alias = "count"
+            else:
+                sbfield = field_map.get(field_name)
+                if sbfield is None:
+                    raise LookupError(
+                        f"Unknown field {field_name!r}; declared fields: "
+                        f"{sorted(field_map)}."
+                    )
+                if fn != "count" and sbfield.is_non_numeric():
+                    raise ValueError(
+                        f"{fn!r} requires a numeric field; {field_name!r} is not."
+                    )
+                alias = f"{fn}_{field_name}"
+            if alias in seen:
+                raise ValueError(f"Duplicate aggregate {alias!r}.")
+            seen.add(alias)
+            specs.append(
+                {
+                    "fn": fn,
+                    "field": field_name,
+                    "alias": alias,
+                    "sbfield": sbfield,
+                    "multiplying": (
+                        fn == "count"
+                        and sbfield is not None
+                        and sbfield.is_multivalued()
+                    ),
+                }
+            )
+        return specs
+
+    def get_aggregates(self, aggregate, field_map=None) -> dict:
+        """Compute ``{alias: value}`` for ``aggregate`` over the filtered set.
+
+        Reuses the list's filtered, annotated queryset. Non-multiplying
+        metrics batch into one query; a ``count`` over a multi-valued
+        relation runs separately and is merged.
+        """
+        specs = self.validate_aggregate(aggregate, field_map=field_map)
+        # Full base so every aggregable field's annotation is present.
+        queryset = self.get_data_queryset()
+        pk_name = self.get_pk_field().name
+
+        # Resolve each spec to its ORM target and annotate any expression
+        # value the visible-column set doesn't already cover.
+        extra: dict = {}
+        for spec in specs:
+            field = spec["sbfield"]
+            if field is None:
+                spec["target"] = pk_name
+                continue
+            if spec["fn"] == "count" and field.model_field is not None:
+                spec["target"] = field.model_field.name
+                continue
+            spec["target"] = field.field
+            if field.field in queryset.query.annotations or field.annotate is None:
+                continue
+            if field.supporting_annotates:
+                extra.update(field.supporting_annotates)
+            extra[field.field] = field.annotate
+        if extra:
+            queryset = queryset.annotate(**extra)
+
+        # Narrow to the same rows as the count path so aggregates match it.
+        queryset = queryset.filter(self.get_filter_from_request())
+        queryset = self.search_in_queryset(queryset)
+        request = self.threadsafe_request
+        for plugin in request.request_data.configuration.plugins:
+            queryset = plugin.modify_count_queryset(self, request=request, qs=queryset)
+
+        batch: dict = {}
+        isolated: list[tuple[str, Any]] = []
+        for spec in specs:
+            agg = LIST_AGGREGATE_FUNCTIONS[spec["fn"]](spec["target"])
+            if spec["multiplying"]:
+                isolated.append((spec["alias"], agg))
+            else:
+                batch[spec["alias"]] = agg
+
+        # Undetermined-type expressions are only rejected once Django
+        # resolves them against the query.
+        try:
+            result: dict = {}
+            if batch:
+                result.update(queryset.aggregate(**batch))
+            for alias, agg in isolated:
+                result[alias] = queryset.aggregate(**{alias: agg})[alias]
+        except FieldError as exc:
+            raise ValueError(f"Cannot aggregate the requested field(s): {exc}") from exc
+        return result

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/admin/admin_base.py

@@ -61,7 +61,6 @@ from django_smartbase_admin.engine.inline_pagination import (
     get_inline_partial_prefix,
 )
 from django_smartbase_admin.engine.dynamic_forms import (
-    SBADMIN_DYNAMIC_REGION_ADD_MODIFIER,
     SBADMIN_DYNAMIC_REGION_PREFIX_PARAM,
     SBADMIN_DYNAMIC_REGION_PARAM,
     SBAdminDynamicFormMixin,
@@ -559,6 +558,7 @@ class SBAdminInlineAndAdminCommon(SBAdminFormFieldWidgetsMixin):
                 inline_view_instance.init_view_static(
                     configuration, inline_view_instance.model, admin_site
                 )
+        super().init_view_static(configuration, model, admin_site)
 
     def get_sbadmin_fake_inlines(self, request, obj) -> Iterable:
         return self.sbadmin_fake_inlines or []
@@ -646,13 +646,13 @@ class SBAdminInlineAndAdminCommon(SBAdminFormFieldWidgetsMixin):
             fieldsets.append((fieldset[0], fieldset_dict))
         return fieldsets
 
-    def get_dynamic_region_object(self, request, modifier):
-        if modifier == SBADMIN_DYNAMIC_REGION_ADD_MODIFIER:
+    def get_dynamic_region_object(self, request, modifier, object_id=None):
+        if object_id is None:
             return None
         if hasattr(self, "get_object"):
-            return self.get_object(request, modifier)
+            return self.get_object(request, object_id)
         try:
-            return self.get_queryset(request).get(pk=modifier)
+            return self.get_queryset(request).get(pk=object_id)
         except self.model.DoesNotExist:
             return None
 
@@ -672,7 +672,7 @@ class SBAdminInlineAndAdminCommon(SBAdminFormFieldWidgetsMixin):
         return form_kwargs
 
     @sbadmin_action
-    def sbadmin_dynamic_region(self, request, modifier):
+    def sbadmin_dynamic_region(self, request, modifier, object_id=None):
         if request.method != "POST":
             return HttpResponseNotAllowed(["POST"])
 
@@ -680,8 +680,8 @@ class SBAdminInlineAndAdminCommon(SBAdminFormFieldWidgetsMixin):
         if not region_name:
             return HttpResponseBadRequest(f"Missing {SBADMIN_DYNAMIC_REGION_PARAM}.")
 
-        obj = self.get_dynamic_region_object(request, modifier)
-        if modifier != SBADMIN_DYNAMIC_REGION_ADD_MODIFIER and obj is None:
+        obj = self.get_dynamic_region_object(request, modifier, object_id)
+        if object_id is not None and obj is None:
             return HttpResponse("", status=404)
 
         form_class = self.get_dynamic_region_form_class(request, obj)
@@ -921,6 +921,9 @@ class SBAdmin(
     menu_label = None
     sbadmin_is_generic_model = False
 
+    def get_widget_parent_view(self, widget):
+        return self
+
     def save_formset(self, request, form, formset, change):
         if not change and hasattr(formset, "inline_instance"):
             # update inline_instance parent_instance on formset when creating new object
@@ -977,7 +980,9 @@ class SBAdmin(
         return self.sbadmin_tabs
 
     def get_tabs_context(self, request, object_id) -> dict[str, Iterable]:
-        return {"tabs_context": self.get_sbadmin_tabs(request, object_id)}
+        return {
+            "tabs_context": self.get_sbadmin_tabs(request, object_id),
+        }
 
     def get_context_data(self, request) -> dict[str, Any]:
         return {
@@ -1109,6 +1114,13 @@ class SBAdmin(
     def changelist_view(self, request, extra_context=None):
         return self.action_list(request, extra_context=extra_context)
 
+    def get_change_view_widget_media(self, request, obj=None):
+        media = forms.Media()
+        for widget in self.get_widget_views(request, getattr(obj, "pk", None)):
+            if hasattr(widget, "get_media"):
+                media += widget.get_media()
+        return media
+
     def render_change_form(
         self, request, context, add=False, change=False, form_url="", obj=None
     ):
@@ -1116,6 +1128,8 @@ class SBAdmin(
         if partial_response is not None:
             return partial_response
 
+        context["media"] += self.get_change_view_widget_media(request, obj)
+
         if context.get("sbadmin_is_modal"):
             media = context["media"]
             js_assets = [str(asset) for asset in getattr(media, "_js", [])]

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/admin/site.py

@@ -16,7 +16,7 @@ except ImportError:
 
 
 from django.http import Http404, HttpRequest, HttpResponse, HttpResponseRedirect
-from django.urls import URLPattern, URLResolver, path, reverse, reverse_lazy
+from django.urls import URLPattern, URLResolver, path, re_path, reverse, reverse_lazy
 from django.utils.decorators import method_decorator
 from django.utils.functional import LazyObject
 from django.utils.module_loading import import_string
@@ -33,6 +33,10 @@ from django_smartbase_admin.views.global_filter_view import GlobalFilterView
 
 
 class SBAdminSite(admin.AdminSite):
+    # Stock AdminSite appends catch_all inside get_urls(); that blocks SBAdmin action
+    # URLs registered later. We append the same view manually at the end of get_urls().
+    final_catch_all_view = False
+
     login_template = "sb_admin/authentification/login.html"
     logout_template = "sb_admin/authentification/logout.html"
     password_change_template = "sb_admin/authentification/password_change.html"
@@ -106,6 +110,30 @@ class SBAdminSite(admin.AdminSite):
     def _stock_admin_endpoint_404(request: HttpRequest, *args, **kwargs):
         raise Http404()
 
+    def _sbadmin_action_url_patterns(self) -> list[URLPattern]:
+        entrypoint = self.admin_view(SBAdminEntrypointView.as_view())
+        return [
+            path(
+                "<str:view>/<str:action>/<str:modifier>/",
+                entrypoint,
+                name="sb_admin_base",
+            ),
+            path(
+                "<str:view>/<str:action>/<str:modifier>/<str:object_id>/",
+                entrypoint,
+                name="sb_admin_base",
+            ),
+        ]
+
+    def _admin_catch_all_pattern(self) -> URLPattern:
+        """Same pattern as ``AdminSite.get_urls()`` when ``final_catch_all_view`` is True."""
+        # Stock catch-all must not use SBAdmin's ``admin_view`` — it always runs
+        # ``initialize_admin_view``, which expects a configured SBAdmin request.
+        return re_path(
+            r"(?P<url>.*)$",
+            super().admin_view(self.catch_all_view),
+        )
+
     def get_urls(self) -> list[URLPattern | URLResolver]:
         from django.contrib.auth.views import (
             PasswordResetView,
@@ -177,7 +205,7 @@ class SBAdminSite(admin.AdminSite):
         if settings.DEBUG:
             urls.append(
                 path(
-                    "components",
+                    "components/",
                     TemplateView.as_view(
                         template_name="sb_admin/includes/components.html"
                     ),
@@ -192,12 +220,12 @@ class SBAdminSite(admin.AdminSite):
                     name="sb_admin_base",
                 ),
                 path(
-                    "global-filter",
+                    "global-filter/",
                     self.admin_view(GlobalFilterView.as_view()),
                     name="global_filter",
                 ),
                 path(
-                    "color-scheme",
+                    "color-scheme/",
                     self.admin_view(ColorSchemeView.as_view()),
                     name="color_scheme",
                 ),
@@ -206,16 +234,6 @@ class SBAdminSite(admin.AdminSite):
                     self.admin_view(ViewOnSiteRedirectView.as_view()),
                     name="view_on_site_redirect",
                 ),
-                path(
-                    "<str:view>/<str:action>/<str:modifier>",
-                    self.admin_view(SBAdminEntrypointView.as_view()),
-                    name="sb_admin_base",
-                ),
-                path(
-                    "<str:view>/<str:action>/<str:modifier>/<str:object_id>",
-                    self.admin_view(SBAdminEntrypointView.as_view()),
-                    name="sb_admin_base",
-                ),
             ]
         )
         # 404 stock django.contrib.admin endpoints that super().get_urls()
@@ -240,6 +258,8 @@ class SBAdminSite(admin.AdminSite):
             ]
         )
         urls.extend(super().get_urls())
+        urls.extend(self._sbadmin_action_url_patterns())
+        urls.append(self._admin_catch_all_pattern())
         return urls
 
     @method_decorator(never_cache)

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/audit/sb_admin.py

@@ -649,7 +649,7 @@ class AdminAuditLogAdmin(SBAdmin):
     _OBJECT_HISTORY_FILTER_CACHE_KEY = "_audit_object_history_filter"
 
     @sbadmin_action(permission="view")
-    def action_list_json(self, request, modifier, page_size=None):
+    def action_list_json(self, request, modifier, object_id=None, page_size=None):
         """Override to ensure object_history filter is cached before processing rows."""
         from django.http import JsonResponse
 

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/audit/tests/test_action_processing.py

@@ -18,10 +18,7 @@ from django_smartbase_admin.engine.admin_base_view import (
     SBAdminBaseListView,
     SBAdminBaseView,
 )
-from django_smartbase_admin.engine.const import (
-    IGNORE_LIST_SELECTION,
-    MODIFIER_OBJECT_ID,
-)
+from django_smartbase_admin.engine.const import MODIFIER_OBJECT_ID
 from django_smartbase_admin.engine.modal_view import (
     ActionModalView,
     RowActionModalView,
@@ -45,6 +42,9 @@ class FakeAdminView(SBAdminBaseView):
         self.row_actions = row_actions or []
         self.has_action_permission = has_action_permission
 
+    def get_id(self):
+        return "articles"
+
     def get_action_url(self, action, modifier="template", object_id=None):
         url = f"/actions/{action}/{modifier}/"
         if object_id is not None:
@@ -81,6 +81,9 @@ class FakeAdminView(SBAdminBaseView):
     def get_config_url(self, request):
         return ""
 
+    def get_list_view_media(self, request):
+        return forms.Media()
+
     def has_add_permission(self, request):
         return False
 
@@ -412,11 +415,11 @@ class RowActionIntegrationTests(TestCase):
             self.request, [action], object_id=None
         )
 
-        self.assertEqual(action.action_modifier, MODIFIER_OBJECT_ID)
+        self.assertIsNone(action.action_modifier)
         self.assertEqual(processed[0].url, "/actions/PublishArticleView/template/123/")
         self.assertEqual(
             processed_without_object[0].url,
-            f"/actions/PublishArticleView/{IGNORE_LIST_SELECTION}/",
+            "/actions/PublishArticleView/template/",
         )
 
     def test_detail_action_without_object_modifier_keeps_template_modifier(self):
@@ -429,7 +432,7 @@ class RowActionIntegrationTests(TestCase):
 
         processed = view.process_detail_actions(self.request, [action], object_id=123)
 
-        self.assertEqual(processed[0].url, "/actions/contact/template/")
+        self.assertEqual(processed[0].url, "/actions/contact/template/123/")
 
     def test_detail_row_modal_action_infers_current_object(self):
         view = FakeAdminView()
@@ -482,7 +485,6 @@ class RowActionIntegrationTests(TestCase):
         action = SBAdminCustomAction(
             title="Open",
             url=f"/articles/{MODIFIER_OBJECT_ID}/",
-            action_modifier=MODIFIER_OBJECT_ID,
         )
 
         processed = view.process_row_actions(self.request, [action])
@@ -501,7 +503,6 @@ class RowActionIntegrationTests(TestCase):
                     target_view=PublishArticleView,
                     title="Publish",
                     view=view,
-                    action_modifier=MODIFIER_OBJECT_ID,
                 )
             ],
         )
@@ -565,7 +566,7 @@ class ModalActionIntegrationTests(TestCase):
                 return None
 
         response = MissingRowModal.as_view(view=FakeAdminView())(
-            RequestFactory().post("/"), modifier="123"
+            RequestFactory().post("/"), modifier="template", object_id="123"
         )
 
         self.assertEqual(response.status_code, 404)

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/audit/tests/test_delegate_to_action.py

@@ -29,10 +29,10 @@ def _make_view(*, has_permission=True):
     view = MagicMock()
 
     @sbadmin_action
-    def allowed_action(request, modifier):
+    def allowed_action(request, modifier, object_id):
         return HttpResponse("ok")
 
-    def unmarked_method(request, modifier):
+    def unmarked_method(request, modifier, object_id):
         return HttpResponse("should not reach")
 
     view.allowed_action = allowed_action
@@ -89,20 +89,27 @@ class TestDelegateToAction(TestCase):
     def test_dynamic_inner_view_is_marked(self):
         from django_smartbase_admin.engine.admin_base_view import SBAdminBaseView
 
+        seen_kwargs = {}
         mock_action = MagicMock()
-        mock_action.target_view.as_view.return_value = (
-            lambda request, **kwargs: HttpResponse("ok")
-        )
+
+        def target_callable(request, **kwargs):
+            seen_kwargs.update(kwargs)
+            return HttpResponse("ok")
+
+        mock_action.target_view.as_view.return_value = target_callable
 
         base_view = SBAdminBaseView.__new__(SBAdminBaseView)
         inner = base_view.delegate_to_target_view(mock_action.target_view)
+        response = inner(self.factory.get("/"), "template", "123")
+
         self.assertTrue(getattr(inner, "_is_sbadmin_action", False))
-        self.assertTrue(getattr(inner, "_sbadmin_keep_route_modifier_argument", False))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(seen_kwargs, {"modifier": "template", "object_id": "123"})
 
     @patch(PATCH_FROM_REQUEST)
     def test_decorator_permission_propagated_to_action(self, mock_from_request):
         @sbadmin_action(permission="delete")
-        def restricted_action(request, modifier):
+        def restricted_action(request, modifier, object_id):
             return HttpResponse("ok")
 
         view = MagicMock()
@@ -131,8 +138,9 @@ class TestDelegateToAction(TestCase):
         seen = {}
 
         @sbadmin_action
-        def row_action(request, modifier):
+        def row_action(request, modifier, object_id):
             seen["modifier"] = modifier
+            seen["object_id"] = object_id
             return HttpResponse("ok")
 
         view = MagicMock()
@@ -154,7 +162,8 @@ class TestDelegateToAction(TestCase):
         )
 
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(seen["modifier"], "123")
+        self.assertEqual(seen["modifier"], "template")
+        self.assertEqual(seen["object_id"], "123")
 
 
 class TestDefaultActionPermission(TestCase):
@@ -184,7 +193,7 @@ class TestDefaultActionPermission(TestCase):
 class TestSbadminActionDecorator(TestCase):
     def test_bare_decorator(self):
         @sbadmin_action
-        def my_action(request, modifier):
+        def my_action(request, modifier, object_id):
             pass
 
         self.assertTrue(my_action._is_sbadmin_action)
@@ -192,7 +201,7 @@ class TestSbadminActionDecorator(TestCase):
 
     def test_decorator_with_kwargs(self):
         @sbadmin_action(permission="delete")
-        def my_action(request, modifier):
+        def my_action(request, modifier, object_id):
             pass
 
         self.assertTrue(my_action._is_sbadmin_action)
@@ -204,10 +213,10 @@ class TestMenuActionAutoMarking(TestCase):
         class MyView(SBAdminView):
             menu_action = "landing"
 
-            def landing(self, request, modifier):
+            def landing(self, request, modifier, object_id):
                 return HttpResponse("ok")
 
-            def not_menu_action(self, request, modifier):
+            def not_menu_action(self, request, modifier, object_id):
                 return HttpResponse("nope")
 
         v = MyView()
@@ -223,7 +232,7 @@ class TestMenuActionAutoMarking(TestCase):
             menu_action = "landing"
 
             @sbadmin_action(permission="delete")
-            def landing(self, request, modifier):
+            def landing(self, request, modifier, object_id):
                 return HttpResponse("ok")
 
         v = MyView()

{django_smartbase_admin-1.5.2 → django_smartbase_admin-2.0.0}/src/django_smartbase_admin/engine/actions.py

@@ -1,7 +1,5 @@
 from django.core.exceptions import ImproperlyConfigured
 
-from django_smartbase_admin.engine.const import MODIFIER_OBJECT_ID
-
 
 def sbadmin_action(func=None, **kwargs):
     """Mark a view method as callable via SBAdmin URL dispatch.
@@ -22,10 +20,10 @@ def sbadmin_action(func=None, **kwargs):
     Usage::
 
         @sbadmin_action(permission="view")
-        def action_list_json(self, request, modifier): ...
+        def action_list_json(self, request, modifier, object_id): ...
 
         @sbadmin_action(permission="delete")
-        def action_delete_archived(self, request, modifier): ...
+        def action_delete_archived(self, request, modifier, object_id): ...
     """
 
     def decorator(fn):
@@ -211,7 +209,6 @@ class SBAdminRowAction(SBAdminCustomAction):
             open_in_modal=resolved_target_view is not None,
             open_in_new_tab=resolved_open_in_new_tab,
             icon=resolved_icon,
-            action_modifier=MODIFIER_OBJECT_ID,
             sub_actions=resolved_sub_actions,
             mcp_description=mcp_description,
         )