Fix toolbar

django-cms · Dec 9, 2014 · bf9e3dc · bf9e3dc
1 parent 7e0137e
commit bf9e3dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/cms/cms_toolbar.py b/cms/cms_toolbar.py
@@ -101,8 +101,6 @@ class BasicToolbar(CMSToolbar):
 
     def __init__(self, request, toolbar, is_current_app, app_path):
         super(BasicToolbar, self).__init__(request, toolbar, is_current_app, app_path)
-        user_settings = self.request.toolbar.get_user_settings()
-        self.clipboard = user_settings.clipboard
 
     def init_from_request(self):
         self.page = get_page_draft(self.request.current_page)

diff --git a/cms/toolbar/toolbar.py b/cms/toolbar/toolbar.py
@@ -17,7 +17,6 @@
 from django.middleware.csrf import get_token
 from django.utils.translation import ugettext_lazy as _
 from django.utils.datastructures import SortedDict
-from cms.utils.plugins import downcast_plugins
 
 
 class CMSToolbarLoginForm(AuthenticationForm):
@@ -62,12 +61,14 @@ def __init__(self, request):
         self.toolbar_language = self.language
 
         user_settings = self.get_user_settings()
-        if (settings.USE_I18N and user_settings.language in dict(settings.LANGUAGES)) or (
-                not settings.USE_I18N and user_settings.language == settings.LANGUAGE_CODE):
-            self.toolbar_language = user_settings.language
-        else:
-            user_settings.language = self.language
-            user_settings.save()
+        if user_settings:
+            if (settings.USE_I18N and user_settings.language in dict(settings.LANGUAGES)) or (
+                    not settings.USE_I18N and user_settings.language == settings.LANGUAGE_CODE):
+                self.toolbar_language = user_settings.language
+            else:
+                user_settings.language = self.language
+                user_settings.save()
+            self.clipboard = user_settings.clipboard
 
         with force_language(self.language):
             try:
@@ -298,4 +299,3 @@ def _call_toolbar(self, func_name):
                 result = getattr(toolbar, func_name)()
                 if isinstance(result, HttpResponse):
                     return result
-