Fix template retrieval for CarouselSlide and TabItem plugins

Co-authored-by: fsbraun <[email protected]>

Author: Copilot

djangocms_frontend/contrib/carousel/cms_plugins.py

@@ -86,7 +86,7 @@ class CarouselSlidePlugin(
 
     def get_render_template(self, context, instance, placeholder):
         return get_plugin_template(
-            instance.parent or instance,
+            instance.parent.get_plugin_instance()[0] if instance.parent else instance,
             "carousel",
             "slide",
             CAROUSEL_TEMPLATE_CHOICES,

djangocms_frontend/contrib/tabs/cms_plugins.py

@@ -71,7 +71,7 @@ class TabItemPlugin(mixin_factory("TabItem"), AttributesMixin, PaddingMixin, CMS
 
     def get_render_template(self, context, instance, placeholder):
         return get_plugin_template(
-            instance.parent or instance,
+            instance.parent.get_plugin_instance()[0] if instance.parent else instance,
             "tabs",
             "item",
             TAB_TEMPLATE_CHOICES,

tests/carousel/test_plugins.py

@@ -1,10 +1,12 @@
 from cms.api import add_plugin
 from cms.test_utils.testcases import CMSTestCase
+from django.test import override_settings
 
 from djangocms_frontend.contrib.carousel.cms_plugins import (
     CarouselPlugin,
     CarouselSlidePlugin,
 )
+from djangocms_frontend.contrib.carousel.constants import CAROUSEL_TEMPLATE_CHOICES
 from djangocms_frontend.contrib.carousel.forms import CarouselForm, CarouselSlideForm
 
 from ..fixtures import TestFixture
@@ -129,3 +131,47 @@ def test_carousel_slide_plugin(self):
             response = self.client.get(self.request_url)
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, 'href="https://www.divio.com"')
+
+    @override_settings(
+        DJANGOCMS_FRONTEND_CAROUSEL_TEMPLATES=(
+            ("default", "Default"),
+            ("custom", "Custom"),
+        )
+    )
+    def test_carousel_slide_inherits_parent_template(self):
+        """Test that CarouselSlidePlugin correctly retrieves parent's template."""
+        # Create a carousel with a custom template
+        carousel = add_plugin(
+            placeholder=self.placeholder,
+            plugin_type=CarouselPlugin.__name__,
+            language=self.language,
+            template="custom",
+        )
+        carousel.initialize_from_form(CarouselForm).save()
+        
+        # Create a slide as child of the carousel
+        slide = add_plugin(
+            target=carousel,
+            placeholder=self.placeholder,
+            plugin_type=CarouselSlidePlugin.__name__,
+            language=self.language,
+            config=dict(carousel_image=dict(pk=self.image.id, model="filer.Image")),
+        )
+        slide.initialize_from_form(CarouselSlideForm).save()
+        
+        # Get the plugin instance
+        plugin_instance = CarouselSlidePlugin()
+        
+        # Test that get_render_template uses the parent's template
+        template_path = plugin_instance.get_render_template(
+            context={},
+            instance=slide,
+            placeholder=self.placeholder
+        )
+        
+        # The template path should use 'custom' from the parent, not 'default'
+        self.assertIn("custom", template_path)
+        self.assertEqual(
+            template_path,
+            "djangocms_frontend/bootstrap5/carousel/custom/slide.html"
+        )

tests/tabs/test_plugins.py

@@ -1,5 +1,6 @@
 from cms.api import add_plugin
 from cms.test_utils.testcases import CMSTestCase
+from django.test import override_settings
 
 from djangocms_frontend.contrib.tabs.cms_plugins import TabItemPlugin, TabPlugin
 from djangocms_frontend.contrib.tabs.forms import TabForm, TabItemForm
@@ -42,3 +43,47 @@ def test_tab_item_plugin(self):
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, '<div class="tab-content">')
         self.assertContains(response, "tab-pane")
+
+    @override_settings(
+        DJANGOCMS_FRONTEND_TAB_TEMPLATES=(
+            ("default", "Default"),
+            ("custom", "Custom"),
+        )
+    )
+    def test_tab_item_inherits_parent_template(self):
+        """Test that TabItemPlugin correctly retrieves parent's template."""
+        # Create a tab container with a custom template
+        tab_container = add_plugin(
+            placeholder=self.placeholder,
+            plugin_type=TabPlugin.__name__,
+            language=self.language,
+            template="custom",
+        )
+        tab_container.initialize_from_form(TabForm).save()
+        
+        # Create a tab item as child of the tab container
+        tab_item = add_plugin(
+            target=tab_container,
+            placeholder=self.placeholder,
+            plugin_type=TabItemPlugin.__name__,
+            language=self.language,
+            config=dict(tab_title="Test Tab"),
+        )
+        tab_item.initialize_from_form(TabItemForm).save()
+        
+        # Get the plugin instance
+        plugin_instance = TabItemPlugin()
+        
+        # Test that get_render_template uses the parent's template
+        template_path = plugin_instance.get_render_template(
+            context={},
+            instance=tab_item,
+            placeholder=self.placeholder
+        )
+        
+        # The template path should use 'custom' from the parent, not 'default'
+        self.assertIn("custom", template_path)
+        self.assertEqual(
+            template_path,
+            "djangocms_frontend/bootstrap5/tabs/custom/item.html"
+        )