Avoid calling BasicToolbar.populate() multiple times

django-cms · Jan 29, 2015 · 18adab2 · 18adab2
1 parent 851652b
commit 18adab2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/cms/cms_toolbar.py b/cms/cms_toolbar.py
@@ -98,17 +98,19 @@ class BasicToolbar(CMSToolbar):
     """
     Basic Toolbar for site and languages menu
     """
+    page = None
 
     def init_from_request(self):
         self.page = get_page_draft(self.request.current_page)
 
     def populate(self):
-        self.init_from_request()
+        if not self.page:
+            self.init_from_request()
 
-        self.add_admin_menu()
-        self.add_language_menu()
-        user_settings = self.request.toolbar.get_user_settings()
-        self.clipboard = user_settings.clipboard
+            self.add_admin_menu()
+            self.add_language_menu()
+            user_settings = self.request.toolbar.get_user_settings()
+            self.clipboard = user_settings.clipboard
 
     def add_admin_menu(self):
         admin_menu = self.toolbar.get_or_create_menu(ADMIN_MENU_IDENTIFIER, self.current_site.name)