django-smartbase-admin 2.0.5__tar.gz → 2.0.6__tar.gz

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/PKG-INFO

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

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/pyproject.toml

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

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/src/django_smartbase_admin/actions/admin_action_list.py

@@ -4,7 +4,7 @@ import math
 from typing import Any, TYPE_CHECKING
 
 from django.contrib.admin.utils import lookup_spawns_duplicates
-from django.core.exceptions import FieldError
+from django.core.exceptions import FieldDoesNotExist, FieldError
 from django.db.models import Avg, Count, Field, Max, Min, Q, Sum, Value
 from django.utils import timezone
 from django.utils.html import escape
@@ -53,6 +53,16 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__name__)
 
+
+def _lookup_targets_bare_relation(model, lookup: str) -> bool:
+    """Whether ``lookup`` is a bare relation field (e.g. an FK), which can't be
+    text-searched. Traversal paths and unknown names raise and count as False."""
+    try:
+        return model._meta.get_field(lookup).is_relation
+    except FieldDoesNotExist:
+        return False
+
+
 # Whitelisted list aggregations: public name -> Django aggregate class.
 LIST_AGGREGATE_FUNCTIONS = {
     "sum": Sum,
@@ -374,9 +384,13 @@ class SBAdminListAction(SBAdminAction):
         search_fields = self.get_search_fields(request)
         search_fields_definition = list(self.view.get_search_fields(request) or [])
         if search_fields_definition and search_term:
-            search_field_map = {
-                field.name: str(field.filter_field) for field in search_fields
-            }
+            search_field_map = {}
+            for field in search_fields:
+                filter_field = str(field.filter_field)
+                if _lookup_targets_bare_relation(self.view.model, filter_field):
+                    search_field_map[field.name] = str(field.name)
+                else:
+                    search_field_map[field.name] = filter_field
             orm_lookups = []
             for configured_search_field in search_fields_definition:
                 configured_search_field = str(configured_search_field)

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/src/django_smartbase_admin/admin/widgets.py

@@ -1154,19 +1154,26 @@ class SBAdminAutocompleteWidget(
             if parsed_value and related_model_admin.has_view_or_change_permission(
                 request
             ):
-                try:
-                    related_row = (
-                        related_model_admin.get_queryset(request)
-                        .filter(**{self.get_value_field(): parsed_value})
-                        .values("pk")
-                        .first()
-                    )
-                except (ValueError, TypeError):
-                    related_row = None
-                if related_row is not None:
+                value_field = self.get_value_field()
+                pk_field = self.model._meta.pk.name
+                if value_field == pk_field:
                     context["widget"]["attrs"]["related_edit_url"] = (
-                        related_model_admin.get_detail_url(related_row["pk"])
+                        related_model_admin.get_detail_url(parsed_value)
                     )
+                else:
+                    try:
+                        related_row = (
+                            related_model_admin.get_queryset(request)
+                            .filter(**{value_field: parsed_value})
+                            .values("pk")
+                            .first()
+                        )
+                    except (ValueError, TypeError):
+                        related_row = None
+                    if related_row is not None:
+                        context["widget"]["attrs"]["related_edit_url"] = (
+                            related_model_admin.get_detail_url(related_row["pk"])
+                        )
             if related_model_admin.has_add_permission(request):
                 context["widget"]["attrs"]["related_add_url"] = (
                     related_model_admin.get_new_url(request)

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/src/django_smartbase_admin/engine/modal_view.py

@@ -148,6 +148,21 @@ class ActionModalView(SBAdminDynamicFormViewMixin, FormView):
     def process_form_valid(self, request, form):
         return self.build_success_response(request)
 
+    def get(self, request, *args, **kwargs):
+        form = self.get_form()
+        if self.should_confirm_on_get(request, form):
+            try:
+                preview = self.get_confirmation_data(request, form)
+            except SBAdminActionError as e:
+                form.add_error(None, str(e))
+                return self.form_invalid(form)
+            if preview is not None:
+                return self._build_confirmation_response(request, form, preview)
+        return self.render_to_response(self.get_context_data(form=form))
+
+    def should_confirm_on_get(self, request, form) -> bool:
+        return self.requires_confirmation and not form.visible_fields()
+
     def post(self, request, *args, **kwargs):
         if region_name := request.POST.get(SBADMIN_DYNAMIC_REGION_PARAM):
             return self.build_dynamic_region_response(

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/src/django_smartbase_admin/tests/test_autocomplete_forward_create.py

@@ -187,3 +187,33 @@ class AutocompleteParentPreselectTest(TestCase):
                 sb_admin_site._registry[Folder] = original_admin
 
         self.assertIn("related_edit_url", context["widget"]["attrs"])
+        folder_admin.get_queryset.assert_not_called()
+        self.assertEqual(
+            context["widget"]["attrs"]["related_edit_url"],
+            f"/folders/{self.parent.pk}/change/",
+        )
+
+    def test_custom_value_field_resolves_related_edit_url_pk(self):
+        request = self._request(show_related_buttons=True)
+        original_admin = sb_admin_site._registry.pop(Folder, None)
+        folder_admin = MagicMock()
+        folder_admin.has_view_or_change_permission.return_value = True
+        folder_admin.get_queryset.return_value = Folder.objects.all()
+        folder_admin.get_detail_url.side_effect = lambda pk: f"/folders/{pk}/change/"
+        folder_admin.has_add_permission.return_value = False
+        sb_admin_site._registry[Folder] = folder_admin
+        widget = self._widget()
+        widget.value_field = "name"
+        context = {"widget": {"attrs": {}}}
+        try:
+            widget.add_related_buttons_urls(self.parent.name, request, context)
+        finally:
+            sb_admin_site._registry.pop(Folder, None)
+            if original_admin:
+                sb_admin_site._registry[Folder] = original_admin
+
+        folder_admin.get_queryset.assert_called_once_with(request)
+        self.assertEqual(
+            context["widget"]["attrs"]["related_edit_url"],
+            f"/folders/{self.parent.pk}/change/",
+        )

{django_smartbase_admin-2.0.5 → django_smartbase_admin-2.0.6}/src/django_smartbase_admin/tests/test_dynamic_forms.py

@@ -519,6 +519,28 @@ class DynamicRegionActionModal(ActionModalView):
     form_class = DynamicRegionForm
 
 
+class EmptyConfirmationActionModal(ActionModalView):
+    form_class = forms.Form
+    requires_confirmation = True
+    confirmation_message = "Delete {name}?"
+
+    def get_confirmation_data(self, request, form):
+        return {"name": "row"}
+
+
+class VisibleFieldConfirmationForm(forms.Form):
+    name = forms.CharField()
+
+
+class VisibleFieldConfirmationActionModal(ActionModalView):
+    form_class = VisibleFieldConfirmationForm
+    requires_confirmation = True
+    confirmation_message = "Submit {name}?"
+
+    def get_confirmation_data(self, request, form):
+        return {"name": form.cleaned_data["name"]}
+
+
 class CrossFieldsetDynamicRegionModal(ActionModalView):
     form_class = CrossFieldsetRegionForm
 
@@ -1572,6 +1594,33 @@ class DynamicFormTests(SimpleTestCase):
 
         self.assertEqual(form.fields["mode"].widget.attrs["hx-post"], "/modal/action/")
 
+    def test_empty_action_modal_can_render_confirmation_on_get(self):
+        request = RequestFactory().get("/modal/action/")
+        SBAdminThreadLocalService.set_request(request)
+        modal = EmptyConfirmationActionModal(view=FakeView())
+        modal.setup(request)
+
+        response = modal.get(request)
+        html = response.content.decode()
+
+        self.assertIn("Delete row?", html)
+        self.assertIn('name="_confirmed" value="1"', html)
+
+    def test_action_modal_with_visible_fields_keeps_form_on_get_before_confirmation(
+        self,
+    ):
+        request = RequestFactory().get("/modal/action/")
+        SBAdminThreadLocalService.set_request(request)
+        modal = VisibleFieldConfirmationActionModal(view=FakeView())
+        modal.setup(request)
+
+        response = modal.get(request)
+        html = response.rendered_content
+
+        self.assertIn('id="sb-admin-modal-form"', html)
+        self.assertNotIn("Submit", html)
+        self.assertNotIn('name="_confirmed" value="1"', html)
+
     def test_action_modal_dynamic_region_initial_is_built_from_request_data(self):
         request = RequestFactory().post(
             "/modal/action/",