Fix #5013

django-cms · Feb 21, 2016 · cacc233 · cacc233
1 parent 94faefc
commit cacc233
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+=== 3.2.2 (Unreleased) ===
+
+* Fix ToolbarMiddleware.is_cms_request logic
+
 === 3.2.1 (2016-01-29) ===
 
 - Add support for Django 1.9 (with some deprecation warnings).

diff --git a/cms/middleware/toolbar.py b/cms/middleware/toolbar.py
@@ -54,6 +54,7 @@ class ToolbarMiddleware(object):
     def is_cms_request(self, request):
         toolbar_hide = get_cms_setting('TOOLBAR_HIDE')
 
+        print("hide", toolbar_hide)
         if not toolbar_hide:
             return True
 
@@ -62,7 +63,7 @@ def is_cms_request(self, request):
         except:
             return False
 
-        return match.app_name in ('pages-root', 'pages-details-by-slug')
+        return match.url_name in ('pages-root', 'pages-details-by-slug')
 
     def process_request(self, request):
         """

diff --git a/cms/test_utils/project/nonroot_urls.py b/cms/test_utils/project/nonroot_urls.py
@@ -1,6 +1,7 @@
 from django.views.i18n import javascript_catalog
 from django.views.static import serve
 
+from cms.test_utils.project.placeholderapp.views import example_view
 from cms.utils import get_cms_setting
 from cms.utils.compat.dj import is_installed
 from django.conf import settings
@@ -21,6 +22,7 @@
 urlpatterns += i18n_patterns('',
     url(r'^admin/', include(admin.site.urls)),
     url(r'^content/', include('cms.urls')),
+    url(r'^example/$', example_view, name='example_view'),
 )
 
 

diff --git a/cms/tests/test_toolbar.py b/cms/tests/test_toolbar.py
@@ -96,7 +96,7 @@ def _fake_logentry(self, instance_id, user, text, model=Page):
 class ToolbarMiddlewareTest(ClearURLs, ToolbarTestBase):
     @override_settings(CMS_TOOLBAR_HIDE=False)
     def test_no_app_setted_show_toolbar_in_non_cms_urls(self):
-        request = self.get_page_request(None, self.get_anon(), '/')
+        request = self.get_page_request(None, self.get_anon(), '/en/example/')
         self.assertTrue(hasattr(request, 'toolbar'))
 
     @override_settings(CMS_TOOLBAR_HIDE=False)
@@ -107,25 +107,27 @@ def test_no_app_setted_show_toolbar_in_cms_urls(self):
 
     @override_settings(CMS_TOOLBAR_HIDE=False)
     def test_app_setted_hide_toolbar_in_non_cms_urls_toolbar_hide_unsetted(self):
-        request = self.get_page_request(None, self.get_anon(), '/')
+        request = self.get_page_request(None, self.get_anon(), '/en/example/')
         self.assertTrue(hasattr(request, 'toolbar'))
 
     @override_settings(CMS_TOOLBAR_HIDE=True)
     def test_app_setted_hide_toolbar_in_non_cms_urls(self):
-        request = self.get_page_request(None, self.get_anon(), '/')
+        request = self.get_page_request(None, self.get_anon(), '/en/example/')
         self.assertFalse(hasattr(request, 'toolbar'))
 
+    @override_settings(CMS_TOOLBAR_HIDE=False)
     def test_app_setted_show_toolbar_in_cms_urls(self):
         page = create_page('foo', 'col_two.html', 'en', published=True)
+        page = create_page('foo', 'col_two.html', 'en', published=True, parent=page)
         request = self.get_page_request(page, self.get_anon())
         self.assertTrue(hasattr(request, 'toolbar'))
 
     @override_settings(CMS_TOOLBAR_HIDE=True)
-    def test_app_setted_hide_toolbar_in_cms_urls(self):
+    def test_app_setted_show_toolbar_in_cms_urls_subpage(self):
         page = create_page('foo', 'col_two.html', 'en', published=True)
         page = create_page('foo', 'col_two.html', 'en', published=True, parent=page)
         request = self.get_page_request(page, self.get_anon())
-        self.assertFalse(hasattr(request, 'toolbar'))
+        self.assertTrue(hasattr(request, 'toolbar'))
 
 
 @override_settings(CMS_PERMISSION=False)