Fixes django-cms#6013 -- Show Edit Page button on non-cms pages with placeholders (django-cms#6014)

Author: czpython

CHANGELOG.txt

@@ -3,6 +3,8 @@
 * Fixed a bug where slug wouldn't be generated in the creation wizard
 * Fixed a bug where the add page endpoint rendered ``Change page`` as the html title.
 * Fixed an issue where non-staff users could request the wizard create endpoint.
+* Fixed an issue where the ``Edit page`` toolbar button wouldn't show on non-cms pages
+  with placeholders.
 
 
 === 3.4.4 (2017-06-15) ===

cms/cms_toolbars.py

@@ -62,7 +62,7 @@ def init_from_request(self):
 
     def init_placeholders(self):
         content_renderer = self.toolbar.content_renderer
-        self.placeholders = content_renderer.get_rendered_editable_placeholders()
+        self.editable_placeholders = content_renderer.get_rendered_editable_placeholders()
         self.statics = content_renderer.get_rendered_static_placeholders()
 
     def populate(self):
@@ -79,7 +79,7 @@ def add_structure_mode(self):
             if page_permissions.user_can_change_page(self.request.user, page=self.page):
                 return self.add_structure_mode_item()
 
-        elif any(ph for ph in self.placeholders if ph.has_change_permission(self.request.user)):
+        elif any(ph for ph in self.editable_placeholders if ph.has_change_permission(self.request.user)):
             return self.add_structure_mode_item()
 
         for sp in self.statics:
@@ -267,7 +267,7 @@ def init_from_request(self):
 
     def init_placeholders(self):
         content_renderer = self.toolbar.content_renderer
-        self.placeholders = content_renderer.get_rendered_editable_placeholders()
+        self.placeholders = content_renderer.get_rendered_placeholders()
         self.statics = content_renderer.get_rendered_static_placeholders()
         self.dirty_statics = [sp for sp in self.statics if sp.dirty]
 

cms/test_utils/project/placeholderapp/views.py

@@ -69,6 +69,11 @@ def detail_view(request, pk, template_name='detail.html', item_name="char_1",
     return _base_detail(request, instance, template_name, item_name, template_string)
 
 
+def latest_view(request):
+    example = Example1.objects.latest('id')
+    return detail_view(request, pk=example.pk)
+
+
 def detail_view_char(request, pk, template_name='detail.html', item_name="char_1",
                      template_string='',):
     instance = CharPksExample.objects.get(pk=pk)

cms/test_utils/project/urls.py

@@ -11,7 +11,7 @@
 from cms.utils.compat.dj import is_installed
 from cms.utils.conf import get_cms_setting
 from cms.test_utils.project.sampleapp.forms import LoginForm, LoginForm2, LoginForm3
-from cms.test_utils.project.placeholderapp.views import example_view
+from cms.test_utils.project.placeholderapp.views import example_view, latest_view
 from cms.test_utils.project.sampleapp.views import plain_view
 
 admin.autodiscover()
@@ -36,6 +36,7 @@
         kwargs={'authentication_form': LoginForm3}),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^example/$', example_view),
+    url(r'^example/latest/$', latest_view),
     url(r'^plain_view/$', plain_view),
     url(r'^', include('cms.urls')),
 )

cms/tests/test_toolbar.py

@@ -224,6 +224,30 @@ def test_markup(self):
         self.assertContains(response, '<div id="cms-top"')
         self.assertContains(response, 'cms.base.css')
 
+    def test_live_draft_markup_on_app_page(self):
+        """
+        Checks that the "edit page" button shows up
+        on non-cms pages with app placeholders and no static placeholders.
+        """
+        superuser = self.get_superuser()
+
+        output = (
+            '<a class="cms-btn cms-btn-action cms-btn-switch-edit" '
+            'href="?{}">Edit page</a>'
+        ).format(get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON'))
+
+        Example1.objects.create(
+            char_1="char_1",
+            char_2="char_2",
+            char_3="char_3",
+            char_4="char_4",
+        )
+
+        with self.login_user_context(superuser):
+            response = self.client.get('/en/example/latest/?%s' % get_cms_setting('CMS_TOOLBAR_URL__EDIT_OFF'))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, output, html=True)
+
     def test_markup_generic_module(self):
         create_page("toolbar-page", "col_two.html", "en", published=True)
         superuser = self.get_superuser()