Fix django-cms#4135 - Cast watch_models to list

AlexProfi · Jun 7, 2015 · e02cd73 · e02cd73
1 parent dc80fb2
commit e02cd73
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cms/test_utils/project/placeholderapp/cms_toolbar.py b/cms/test_utils/project/placeholderapp/cms_toolbar.py
@@ -12,7 +12,7 @@
 
 @toolbar_pool.register
 class Example1Toolbar(CMSToolbar):
-    watch_models = [Example1, CharPksExample]
+    watch_models = (Example1, CharPksExample)
 
     def populate(self):
         admin_menu = self.toolbar.get_or_create_menu(ADMIN_MENU_IDENTIFIER)

diff --git a/cms/tests/toolbar_pool.py b/cms/tests/toolbar_pool.py
@@ -60,3 +60,7 @@ def test_settings(self):
                 response = self.client.get("/en/?%s" % get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON'))
                 self.assertEqual(response.status_code, 200)
         toolbar_pool.toolbars = toolbars
+
+    def test_watch_models(self):
+        toolbar_pool.discover_toolbars()
+        self.assertEqual(type(toolbar_pool.get_watch_models()), list)
diff --git a/cms/toolbar_pool.py b/cms/toolbar_pool.py
@@ -55,7 +55,7 @@ def get_toolbars(self):
         return self.toolbars
 
     def get_watch_models(self):
-        return sum((getattr(tb, 'watch_models', [])
+        return sum((list(getattr(tb, 'watch_models', []))
                     for tb in self.toolbars.values()), [])