django-cms · fsbraun · Jul 17, 2024 · Jul 11, 2024 · Jul 11, 2024 · Jul 17, 2024
diff --git a/.github/workflows/new_contributor_pr.yml b/.github/workflows/new_contributor_pr.yml
@@ -29,6 +29,7 @@ jobs:
     needs: new
     steps:
       - name: Send Discord Webhook
+        continue-on-error: true
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }}
           DISCORD_EMBEDS: |

diff --git a/cms/plugin_rendering.py b/cms/plugin_rendering.py
@@ -13,6 +13,7 @@
 from django.utils.translation import override
 
 from cms.cache.placeholder import get_placeholder_cache, set_placeholder_cache
+from cms.exceptions import PlaceholderNotFound
 from cms.models import PageContent, Placeholder
 from cms.toolbar.utils import (
     get_placeholder_toolbar_js,
@@ -343,6 +344,8 @@ def render_obj_placeholder(self, slot, context, inherit,
         # Not page, therefore we will use toolbar object as
         # the current object and render the placeholder
         current_obj = self.toolbar.get_object()
+        if current_obj is None:
+            raise PlaceholderNotFound(f"No object found for placeholder '{slot}'")
         rescan_placeholders_for_obj(current_obj)
         placeholder = Placeholder.objects.get_for_obj(current_obj).get(slot=slot)
         content = self.render_placeholder(

diff --git a/cms/tests/test_placeholder.py b/cms/tests/test_placeholder.py
@@ -11,7 +11,7 @@
 
 from cms import constants
 from cms.api import add_plugin, create_page, create_page_content
-from cms.exceptions import DuplicatePlaceholderWarning
+from cms.exceptions import DuplicatePlaceholderWarning, PlaceholderNotFound
 from cms.models.fields import PlaceholderField
 from cms.models.placeholdermodel import Placeholder
 from cms.models.pluginmodel import CMSPlugin
@@ -141,6 +141,17 @@ def test_placeholder_scanning_var(self):
         phs = sorted(node.get_declaration().slot for node in _scan_placeholders(t.nodelist))
         self.assertListEqual(phs, sorted(['two', 'new_one', 'base_outside']))
 
+    def test_placeholder_scanning_no_object(self):
+        """Placeholder scanning for a template without a toolbar object raises PlaceholderNotFound"""
+
+        context = SekizaiContext()
+        request = self.get_request(language="en", page=None)
+        toolbar = get_toolbar_from_request(request)
+        renderer = toolbar.get_content_renderer()
+        with self.assertRaises(PlaceholderNotFound):
+            renderer.render_obj_placeholder("someslot", context, False)
+
+
     def test_fieldsets_requests(self):
         response = self.client.get(admin_reverse('placeholderapp_example1_add'))
         self.assertEqual(response.status_code, 200)

diff --git a/cms/utils/placeholder.py b/cms/utils/placeholder.py
@@ -1,6 +1,7 @@
 import operator
 import warnings
 from collections import OrderedDict
+from typing import Union
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -406,11 +407,13 @@ def rescan_placeholders_for_obj(obj):
     return existing
 
 
-def get_declared_placeholders_for_obj(obj):
+def get_declared_placeholders_for_obj(obj: Union[models.Model, None]) -> list[Placeholder]:
     """Returns declared placeholders for an object. The object is supposed to have a method ``get_template``
     which returns the template path as a string that renders the object. ``get_declared_placeholders`` returns
     a list of placeholders used in the template by the ``{% placeholder %}`` template tag.
     """
+    if obj is None:
+        return []
     if not hasattr(obj, "get_template"):
         raise NotImplementedError(
             "%s should implement get_template" % obj.__class__.__name__