fix(generic-relations): Pass parent model metadata explicitly

Author: mihalikv

src/django_smartbase_admin/admin/admin_base.py

@@ -162,6 +162,7 @@
     SBADMIN_PARENT_INSTANCE_PK_VAR,
     SBADMIN_PARENT_INSTANCE_LABEL_VAR,
     SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR,
+    SBADMIN_PARENT_INSTANCE_MODEL_VAR,
     SBADMIN_RELOAD_ON_SAVE_VAR,
 )
 from django_smartbase_admin.engine.const import (
@@ -1301,17 +1302,18 @@ def response_change(self, request, obj):
     def set_generic_relation_from_parent(cls, request, obj):
         from django_smartbase_admin.admin.site import sb_admin_site
 
-        parent_path = cls.get_request_parameter(
+        parent_field = cls.get_request_parameter(
             request, SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR
         )
+        parent_model_path = cls.get_request_parameter(
+            request, SBADMIN_PARENT_INSTANCE_MODEL_VAR
+        )
         parent_pk = cls.get_request_parameter(request, SBADMIN_PARENT_INSTANCE_PK_VAR)
-        if not (parent_path and parent_pk):
+        if not (parent_field and parent_model_path and parent_pk):
             return
 
-        # Token: ``modal_<app>_<model>_<field>_<parent_model>``; rsplit
-        # tolerates underscores in app labels / model names.
         try:
-            _, _, app_label, model_name = parent_path.rsplit("_", 3)
+            app_label, model_name = parent_model_path.split(".", 1)
             content_type = ContentType.objects.get(
                 app_label=app_label, model=model_name
             )
@@ -1529,14 +1531,20 @@ def get_context_data(self, request) -> dict[str, Any]:
             "add_url": add_url,
         }
         if self.parent_instance:
+            parent_field_name = "{}_{}_id_{}".format(
+                self.model._meta.app_label,
+                self.model._meta.model_name,
+                self.parent_model._meta.model_name,
+            )
+            parent_model_path = "{}.{}".format(
+                self.parent_model._meta.app_label,
+                self.parent_model._meta.model_name,
+            )
             context_data["parent_data"] = {
                 SBADMIN_PARENT_INSTANCE_PK_VAR: self.parent_instance.pk,
                 SBADMIN_PARENT_INSTANCE_LABEL_VAR: str(self.parent_instance),
-                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: "{}_{}_id_{}".format(
-                    self.model._meta.app_label,
-                    self.model._meta.model_name,
-                    self.parent_model._meta.model_name,
-                ),
+                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: parent_field_name,
+                SBADMIN_PARENT_INSTANCE_MODEL_VAR: parent_model_path,
             }
         return context_data
 

src/django_smartbase_admin/engine/admin_base_view.py

@@ -69,6 +69,7 @@
 
 SBADMIN_IS_MODAL_VAR = "sbadmin_is_modal"
 SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR = "sbadmin_parent_instance_field"
+SBADMIN_PARENT_INSTANCE_MODEL_VAR = "sbadmin_parent_instance_model"
 SBADMIN_PARENT_INSTANCE_PK_VAR = "sbadmin_parent_instance_pk"
 SBADMIN_PARENT_INSTANCE_LABEL_VAR = "sbadmin_parent_instance_label"
 SBADMIN_RELOAD_ON_SAVE_VAR = "sbadmin_reload_on_save"

src/django_smartbase_admin/templates/sb_admin/inlines/table_inline.html

@@ -58,7 +58,7 @@
                                         class="btn btn-icon ml-auto {{ inline_admin_formset.handler_classes|join:" " }}"
                                         data-bs-toggle="modal"
                                         data-bs-target="#sb-admin-modal"
-                                        hx-get="{{ context_data.add_url }}?_popup=1&sbadmin_is_modal=1&sbadmin_reload_on_save=1&sbadmin_parent_instance_field=modal_{{ context_data.parent_data.sbadmin_parent_instance_field|urlencode }}&sbadmin_parent_instance_pk={{ context_data.parent_data.sbadmin_parent_instance_pk|urlencode }}&sbadmin_parent_instance_label={{ context_data.parent_data.sbadmin_parent_instance_label|urlencode }}"
+                                        hx-get="{{ context_data.add_url }}?_popup=1&sbadmin_is_modal=1&sbadmin_reload_on_save=1&sbadmin_parent_instance_field=modal_{{ context_data.parent_data.sbadmin_parent_instance_field|urlencode }}&sbadmin_parent_instance_model={{ context_data.parent_data.sbadmin_parent_instance_model|urlencode }}&sbadmin_parent_instance_pk={{ context_data.parent_data.sbadmin_parent_instance_pk|urlencode }}&sbadmin_parent_instance_label={{ context_data.parent_data.sbadmin_parent_instance_label|urlencode }}"
                                         hx-target="#sb-admin-modal"
                                         hx-select="#modal-content"
                                         hx-swap="innerHTML"

src/django_smartbase_admin/tests/test_generic_relation_parent.py

@@ -1,14 +1,17 @@
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
+from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.test import RequestFactory, TestCase
 from filer.models import Folder
 
-from django_smartbase_admin.admin.admin_base import SBAdmin
+from django_smartbase_admin.admin.admin_base import SBAdmin, SBAdminInline
+from django_smartbase_admin.admin.widgets import SBAdminAutocompleteWidget
 from django_smartbase_admin.engine.admin_base_view import (
     SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR,
+    SBADMIN_PARENT_INSTANCE_MODEL_VAR,
     SBADMIN_PARENT_INSTANCE_PK_VAR,
 )
 
@@ -28,7 +31,10 @@ def _request(self, pk):
         return self.factory.post(
             "/",
             data={
-                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: f"modal_inline_{self.ct.app_label}_{self.ct.model}",
+                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: "modal_inline",
+                SBADMIN_PARENT_INSTANCE_MODEL_VAR: (
+                    f"{self.ct.app_label}.{self.ct.model}"
+                ),
                 SBADMIN_PARENT_INSTANCE_PK_VAR: str(pk),
             },
         )
@@ -54,3 +60,59 @@ def test_forged_parent_pk_outside_restricted_queryset_is_denied(self):
                 self._request(self.visible.pk), obj
             )
             self.assertEqual(obj.object_id, self.visible.pk)
+
+    def test_generated_inline_parent_token_round_trips_through_parser(self):
+        inline = SBAdminInline.__new__(SBAdminInline)
+        inline.model = Group
+        inline.parent_model = Folder
+        inline.parent_instance = self.visible
+        inline.sortable_field_name = None
+        inline.sb_admin_add_modal = False
+        with patch.object(
+            inline, "get_sbadmin_inline_list_actions_processed", return_value=[]
+        ):
+            parent_data = inline.get_context_data(self.factory.get("/"))["parent_data"]
+
+        request = self.factory.post(
+            "/",
+            data={
+                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: (
+                    f"modal_{parent_data[SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR]}"
+                ),
+                SBADMIN_PARENT_INSTANCE_MODEL_VAR: parent_data[
+                    SBADMIN_PARENT_INSTANCE_MODEL_VAR
+                ],
+                SBADMIN_PARENT_INSTANCE_PK_VAR: str(self.visible.pk),
+            },
+        )
+        parent_admin = MagicMock()
+        parent_admin.has_view_permission.return_value = True
+        parent_admin.get_queryset.return_value = Folder.objects.all()
+        obj = SimpleNamespace()
+
+        with patch.dict(
+            "django_smartbase_admin.admin.site.sb_admin_site._registry",
+            {Folder: parent_admin},
+        ):
+            _ChildAdmin.set_generic_relation_from_parent(request, obj)
+
+        self.assertEqual(obj.content_type, self.ct)
+        self.assertEqual(obj.object_id, self.visible.pk)
+
+    def test_parent_model_metadata_does_not_change_widget_target(self):
+        input_id = "modal_auth_group_id_folder"
+        request = self.factory.get(
+            "/",
+            data={
+                SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: input_id,
+                SBADMIN_PARENT_INSTANCE_MODEL_VAR: "filer.folder",
+                SBADMIN_PARENT_INSTANCE_PK_VAR: str(self.visible.pk),
+            },
+        )
+        widget = SimpleNamespace(input_id=input_id)
+
+        is_parent_widget = SBAdminAutocompleteWidget._should_preselect_parent_instance(
+            widget, request
+        )
+
+        self.assertIs(is_parent_widget, True)

src/django_smartbase_admin/tests/test_modal_parent_context.py

@@ -13,6 +13,7 @@
     SBADMIN_IS_MODAL_VAR,
     SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR,
     SBADMIN_PARENT_INSTANCE_LABEL_VAR,
+    SBADMIN_PARENT_INSTANCE_MODEL_VAR,
     SBADMIN_PARENT_INSTANCE_PK_VAR,
     SBADMIN_RELOAD_ON_SAVE_VAR,
 )
@@ -76,6 +77,7 @@ def test_invalid_modal_post_keeps_parent_context_in_next_post_url(self):
                 SBADMIN_PARENT_INSTANCE_FIELD_NAME_VAR: (
                     "modal_app_attachment_id_parent"
                 ),
+                SBADMIN_PARENT_INSTANCE_MODEL_VAR: "app.parent",
                 SBADMIN_PARENT_INSTANCE_PK_VAR: "42",
                 SBADMIN_PARENT_INSTANCE_LABEL_VAR: "Parent #42",
             }