django-smartbase-admin 1.0.9__py3-none-any.whl → 1.0.11__py3-none-any.whl

django_smartbase_admin/actions/admin_action_list.py

@@ -1,7 +1,8 @@
+from __future__ import annotations
 import json
 import math
+from typing import Any, TYPE_CHECKING
 
-from django.core.paginator import Paginator
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.html import escape
@@ -33,7 +34,6 @@ from django_smartbase_admin.engine.const import (
     CONFIG_NAME,
     TABLE_PARAMS_FULL_TEXT_SEARCH,
     TABLE_PARAMS_SELECTED_FILTER_TYPE,
-    FilterVersions,
     ADVANCED_FILTER_DATA_NAME,
     IGNORE_LIST_SELECTION,
 )
@@ -44,6 +44,9 @@ QueryBuilderService = import_with_injection(
     "django_smartbase_admin.actions.advanced_filters", "QueryBuilderService"
 )
 
+if TYPE_CHECKING:
+    from django_smartbase_admin.engine.field import SBAdminField
+
 
 class SBAdminAction(object):
     view = None
@@ -289,7 +292,7 @@ class SBAdminListAction(SBAdminAction):
             **self.get_annotates(visible_fields)
         )
 
-    def get_visible_column_fields(self):
+    def get_visible_column_fields(self) -> list[SBAdminField]:
         columns_data_dict = self.columns_data.get(COLUMNS_DATA_COLUMNS_NAME, {})
         return [
             field
@@ -407,14 +410,13 @@ class SBAdminListAction(SBAdminAction):
             "last_row": total_count,
         }
 
-    def process_final_data(self, final_data):
+    def process_final_data(self, final_data: list[dict[str, Any]]) -> None:
         visible_columns = self.get_visible_column_fields()
-        fields_with_methods_to_call_by_field_key = {
-            field.field: field
-            for field in visible_columns
-            if field.view_method or field.python_formatter
+        field_key_field_map: dict[str, SBAdminField] = {
+            field.field: field for field in visible_columns
         }
         for row in final_data:
+            obj_id = row.get(self.get_pk_field().name, None)
             additional_data = {}
             if self.view.sbadmin_list_display_data:
                 additional_data = {
@@ -422,13 +424,11 @@ class SBAdminListAction(SBAdminAction):
                     for data in self.view.sbadmin_list_display_data
                 }
             for field_key, value in row.items():
-                if field_key in fields_with_methods_to_call_by_field_key:
-                    field = fields_with_methods_to_call_by_field_key[field_key]
-                    object_id = row.get(self.get_pk_field().name, None)
-                    if field.view_method:
-                        value = field.view_method(object_id, value, **additional_data)
-                    if field.python_formatter:
-                        value = field.python_formatter(object_id, value)
+                if field_key in field_key_field_map:
+                    field = field_key_field_map[field_key]
+                    value = self.view.process_field_data(
+                        self.threadsafe_request, field, obj_id, value, additional_data
+                    )
                 if isinstance(value, str) and not isinstance(value, SafeString):
                     value = escape(value)
                 row[field_key] = value

django_smartbase_admin/admin/admin_base.py

@@ -21,7 +21,7 @@ from django.core.exceptions import (
     PermissionDenied,
 )
 from django.db import models
-from django.db.models import QuerySet
+from django.db.models import QuerySet, Q
 from django.forms import HiddenInput
 from django.forms.models import (
     ModelFormMetaclass,
@@ -36,6 +36,7 @@ from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
 from django_admin_inline_paginator.admin import TabularInlinePaginated
 from django_htmx.http import trigger_client_event
+from django_smartbase_admin.engine.field import SBAdminField
 from filer.fields.file import FilerFileField
 from filer.fields.image import AdminImageFormField, FilerImageField
 from nested_admin.formsets import NestedInlineFormSet
@@ -129,6 +130,7 @@ from django_smartbase_admin.engine.const import (
     OBJECT_ID_PLACEHOLDER,
     TRANSLATIONS_SELECTED_LANGUAGES,
     ROW_CLASS_FIELD,
+    Action,
 )
 from django_smartbase_admin.services.translations import SBAdminTranslationsService
 from django_smartbase_admin.services.views import SBAdminViewService
@@ -816,6 +818,9 @@ class SBAdmin(
     def get_new_url(self, request) -> str:
         return reverse(f"sb_admin:{self.get_id()}_add")
 
+    def get_additional_filter_for_previous_next_context(self, request, object_id) -> Q:
+        return Q()
+
     def get_previous_next_context(self, request, object_id) -> dict | dict[str, Any]:
         if not self.sbadmin_previous_next_buttons_enabled or not object_id:
             return {}
@@ -831,14 +836,17 @@ class SBAdmin(
         list_action = self.sbadmin_list_action_class(
             self, request, all_params=all_params
         )
+        additional_filter = self.get_additional_filter_for_previous_next_context(
+            request, object_id
+        )
         all_ids = list(
-            list_action.build_final_data_count_queryset()
+            list_action.build_final_data_count_queryset(additional_filter)
             .order_by(*list_action.get_order_by_from_request())
             .values_list("id", flat=True)
         )
         index = all_ids.index(int(object_id))
-        previous_id = None if index == 0 else all_ids[index - 1]
-        next_id = None if index == len(all_ids) - 1 else all_ids[index + 1]
+        previous_id = all_ids[-1] if index == 0 else all_ids[index - 1]
+        next_id = all_ids[0] if index == len(all_ids) - 1 else all_ids[index + 1]
         return {
             "previous_url": (
                 f"{self.get_detail_url(previous_id)}?_changelist_filters={changelist_filters}"
@@ -982,6 +990,23 @@ 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/admin/widgets.py

@@ -31,7 +31,9 @@ from django_smartbase_admin.engine.filter_widgets import (
     SBAdminTreeWidgetMixin,
 )
 from django_smartbase_admin.services.thread_local import SBAdminThreadLocalService
-from django_smartbase_admin.templatetags.sb_admin_tags import SBAdminJSONEncoder
+from django_smartbase_admin.templatetags.sb_admin_tags import (
+    SBAdminJSONEncoder,
+)
 from django_smartbase_admin.utils import is_modal
 
 logger = logging.getLogger(__name__)

django_smartbase_admin/engine/fake_inline.py

@@ -3,7 +3,9 @@ from django.db import models
 from django.db.models import F
 from django.forms import BaseInlineFormSet
 
+from django_smartbase_admin.services.thread_local import SBAdminThreadLocalService
 from django_smartbase_admin.services.views import SBAdminViewService
+from django_smartbase_admin.utils import is_modal
 
 
 class FakeQueryset(models.QuerySet):
@@ -33,6 +35,14 @@ class SBAdminFakeInlineFormset(BaseInlineFormSet):
     original_model = None
     inline_instance = None
 
+    @classmethod
+    def get_default_prefix(cls):
+        prefix = super().get_default_prefix()
+        modal_prefix = (
+            "modal_" if is_modal(SBAdminThreadLocalService.get_request()) else ""
+        )
+        return f"{modal_prefix}{prefix}"
+
     def save_new(self, form, commit=True):
         return self.inline_instance.save_new_fake_inline_instance(
             form, self.inline_instance.parent_instance, commit

django_smartbase_admin/engine/field.py

@@ -1,3 +1,6 @@
+from collections.abc import Callable
+from typing import Any
+
 from django.core.exceptions import FieldDoesNotExist, FieldError, ImproperlyConfigured
 from django.db.models import (
     Count,
@@ -52,17 +55,23 @@ class TabulatorFieldOptions(JSONSerializableMixin):
 
 
 class XLSXFieldOptions(JSONSerializableMixin):
-    title = None
-    field = None
-    formatter = None
+    title: str | None = None
+    field: str | None = None
+    formatter: Formatter | None = None
+    python_formatter: Callable[[int, Any], Any] | None = None
 
     def __init__(
-        self, title: str = None, field: str = None, formatter: Formatter = None
+        self,
+        title: str | None = None,
+        field: str | None = None,
+        formatter: Formatter | None = None,
+        python_formatter: Callable[[int, Any], Any] | None = None,
     ) -> None:
         super().__init__()
         self.title = title
         self.field = field
         self.formatter = formatter
+        self.python_formatter = python_formatter
 
 
 class SBAdminField(JSONSerializableMixin):