From e648d80924d9729c03302078c56bc5732b5622a0 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Sun, 27 Apr 2014 09:23:30 +0200 Subject: [PATCH] Fix switch between CMS and HTMLField toolbar --- djangocms_text_ckeditor/widgets.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/djangocms_text_ckeditor/widgets.py b/djangocms_text_ckeditor/widgets.py index 51aeb92..5e27973 100644 --- a/djangocms_text_ckeditor/widgets.py +++ b/djangocms_text_ckeditor/widgets.py @@ -44,11 +44,17 @@ class TextEditorWidget(Textarea): def render_additions(self, name, value, attrs=None): language = get_language().split('-')[0] + configuration = deepcopy(self.configuration) + if not configuration.get('toolbar', False): + if self.placeholder: + configuration['toolbar'] = 'CMS' + else: + configuration['toolbar'] = 'HTMLField' context = { 'ckeditor_class': self.ckeditor_class, 'name': name, 'language': language, - 'settings': language.join(json.dumps(self.configuration).split("{{ language }}")), + 'settings': language.join(json.dumps(configuration).split("{{ language }}")), 'STATIC_URL': settings.STATIC_URL, 'installed_plugins': self.installed_plugins, 'plugin_pk': self.pk,