Merge branch 'develop' into bugfix/issue-6840-slug-uniqueness-on-move

django-cms · May 19, 2021 · cfe0b38 · cfe0b38
2 parents fd90f12 + 4538388
commit cfe0b38
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cms/plugin_base.py b/cms/plugin_base.py
@@ -270,16 +270,18 @@ def render_close_frame(self, request, obj, extra_context=None):
             root = obj
 
         plugins = [root] + list(root.get_descendants().order_by('path'))
+        # simulate the call to the unauthorized CMSPlugin.page property
+        cms_page = obj.placeholder.page if obj.placeholder_id else None
 
         child_classes = self.get_child_classes(
             slot=obj.placeholder.slot,
-            page=obj.page,
+            page=cms_page,
             instance=obj,
         )
 
         parent_classes = self.get_parent_classes(
             slot=obj.placeholder.slot,
-            page=obj.page,
+            page=cms_page,
             instance=obj,
         )