Merge pull request django-commons#747 from JohananOppongAmoateng/django-commons#532

Fix show_in_index=False visibility in  admin sites and sidebar

Author: bckohan

src/polymorphic/admin/childadmin.py

@@ -72,11 +72,7 @@ def get_form(self, request, obj=None, **kwargs):
     def get_model_perms(self, request):
         match = resolve(request.path_info)
 
-        if (
-            not self.show_in_index
-            and match.app_name == "admin"
-            and match.url_name in ("index", "app_list")
-        ):
+        if not self.show_in_index and match.namespace == self.admin_site.name:
             return {"add": False, "change": False, "delete": False}
         return super().get_model_perms(request)
 

src/polymorphic/tests/test_admin.py

@@ -6,6 +6,8 @@
 from django.contrib import admin
 from django.contrib.contenttypes.models import ContentType
 from django.utils.html import escape
+from django.test import RequestFactory
+from django.urls import resolve
 
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 
@@ -105,6 +107,118 @@ def test_get_child_inlines(self):
         self.assertEqual(child_inlines[0], Inline.InlineModelAChild)
         self.assertEqual(child_inlines[1], Inline.InlineModelBChild)
 
+    def test_show_in_index(self):
+        """
+        Test that show_in_index=False hides the model from the index and sidebar.
+        """
+
+        @self.register(Model2A)
+        class Model2Admin(PolymorphicParentModelAdmin):
+            base_model = Model2A
+            child_models = (Model2B,)
+
+        @self.register(Model2B)
+        class Model2BChildAdmin(PolymorphicChildModelAdmin):
+            base_model = Model2A
+            show_in_index = False
+
+        @self.register(Model2C)
+        class Model2CChildAdmin(PolymorphicChildModelAdmin):
+            base_model = Model2A
+            show_in_index = True
+
+        # Case 1: Index Page (url_name="index")
+        request = self.create_admin_request("get", "/tmp-admin/")
+        app_list = self.admin_site.get_app_list(request)
+
+        # Check that Model2B is NOT present
+        found_model2b = any(
+            model["object_name"] == "Model2B" for app in app_list for model in app["models"]
+        )
+        self.assertFalse(found_model2b, "Child model should be hidden in index (Issue #532)")
+
+        found_model2c = any(
+            model["object_name"] == "Model2C" for app in app_list for model in app["models"]
+        )
+        self.assertTrue(found_model2c, "Child model should be visible in sidebar on change page")
+
+        # Case 2: Change Page (url_name="change") - Simulating Sidebar (Issue #497)
+        # We need a URL that resolves to a change view to test the sidebar context.
+        change_url = "/tmp-admin/polymorphic/model2a/1/change/"
+        request = self.create_admin_request("get", change_url)
+        app_list = self.admin_site.get_app_list(request)
+
+        found_model2b = any(
+            model["object_name"] == "Model2B" for app in app_list for model in app["models"]
+        )
+        found_model2c = any(
+            model["object_name"] == "Model2C" for app in app_list for model in app["models"]
+        )
+        self.assertFalse(
+            found_model2b, "Child model should be hidden in sidebar on change page (Issue #497)"
+        )
+        self.assertTrue(found_model2c, "Child model should be visible in sidebar on change page")
+
+    def test_show_in_index_custom_site(self):
+        """
+        Test that show_in_index=False works correctly with a custom AdminSite.
+        """
+        original_name = self.admin_site.name
+        try:
+            # Change the site name to simulate a custom site
+            self.admin_site.name = "custom_admin"
+
+            # Register the model
+            @self.register(Model2B)
+            class Model2ChildAdmin(PolymorphicChildModelAdmin):
+                base_model = Model2A
+                show_in_index = False
+
+            # Re-set URLConf to update patterns with new name
+            from django.urls import clear_url_caches, set_urlconf, path, resolve
+
+            clear_url_caches()
+            set_urlconf(tuple([path("tmp-admin/", self.admin_site.urls)]))
+
+            request = self.create_admin_request("get", "/tmp-admin/")
+
+            # Verify resolving matches namespace 'custom_admin'
+            match = resolve("/tmp-admin/")
+            assert match.namespace == "custom_admin"
+
+            # Now check app list
+            app_list = self.admin_site.get_app_list(request)
+
+            found_model2b = any(
+                model["object_name"] == "Model2B" for app in app_list for model in app["models"]
+            )
+            self.assertFalse(found_model2b, "Child model should be hidden in Custom Admin Site")
+
+        finally:
+            self.admin_site.name = original_name
+
+    def test_get_model_perms_hidden(self):
+        # Register a child admin with show_in_index=False
+        @self.register(Model2B)
+        class Model2ChildAdmin(PolymorphicChildModelAdmin):
+            base_model = Model2A
+            show_in_index = False
+
+        # Simulate a request to the admin index
+        factory = RequestFactory()
+        request = factory.get("/tmp-admin/")
+        match = resolve("/tmp-admin/")
+
+        # Ensure namespace matches admin site
+        match.namespace = self.admin_site.name
+        request._resolver_match = match
+
+        # Call get_model_perms directly
+        perms = Model2ChildAdmin(Model2B, self.admin_site).get_model_perms(request)
+
+        # Assert that all perms are False
+        assert perms == {"add": False, "change": False, "delete": False}
+
     def test_admin_inlines(self):
         """
         Test the registration of inline models.