From 3edb78a4c658ccc8499afc99693a15a5625644c0 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Sun, 23 Sep 2012 21:12:11 -0400 Subject: added startup tests to reflect merge of common to default skin for tinymce editor --- askbot/setup_templates/tinymce_sample_config.py | 4 ++-- askbot/startup_procedures.py | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/askbot/setup_templates/tinymce_sample_config.py b/askbot/setup_templates/tinymce_sample_config.py index c75170b0..ac49da68 100644 --- a/askbot/setup_templates/tinymce_sample_config.py +++ b/askbot/setup_templates/tinymce_sample_config.py @@ -1,7 +1,7 @@ TINYMCE_COMPRESSOR = True TINYMCE_SPELLCHECKER = False -TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'common/media/js/tinymce/') -TINYMCE_URL = STATIC_URL + 'common/media/js/tinymce/' +TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, 'default/media/js/tinymce/') +TINYMCE_URL = STATIC_URL + 'default/media/js/tinymce/' TINYMCE_DEFAULT_CONFIG = { 'plugins': 'askbot_imageuploader,askbot_attachment', 'theme': 'advanced', diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index c6ab75a6..a33f8047 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -580,20 +580,28 @@ def test_tinymce(): if compressor_on is False: errors.append('add line: TINYMCE_COMPRESSOR = True') - #check js root setting + #check js root setting - before version 0.7.44 we used to have + #"common" skin and after we combined it into the default js_root = getattr(django_settings, 'TINYMCE_JS_ROOT', '') - relative_js_path = 'common/media/js/tinymce/' + old_relative_js_path = 'common/media/js/tinymce/' + relative_js_path = 'default/media/js/tinymce/' expected_js_root = os.path.join(django_settings.STATIC_ROOT, relative_js_path) + old_expected_js_root = os.path.join(django_settings.STATIC_ROOT, old_relative_js_path) if os.path.normpath(js_root) != os.path.normpath(expected_js_root): - js_root_template = "add line: TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, '%s')" - errors.append(js_root_template % relative_js_path) + error_tpl = "add line: TINYMCE_JS_ROOT = os.path.join(STATIC_ROOT, '%s')" + if os.path.normpath(js_root) == os.path.normpath(old_expected_js_root): + error_tpl += '\nNote: we have moved files from "common" into "default"' + errors.append(error_tpl % relative_js_path) #check url setting url = getattr(django_settings, 'TINYMCE_URL', '') expected_url = django_settings.STATIC_URL + relative_js_path + old_expected_url = django_settings.STATIC_URL + old_relative_js_path if urls_equal(url, expected_url) is False: - js_url_template = "add line: TINYMCE_URL = STATIC_URL + '%s'" - errors.append(js_url_template % relative_js_path) + error_tpl = "add line: TINYMCE_URL = STATIC_URL + '%s'" + if urls_equal(url, old_expected_url): + error_tpl += '\nNote: we have moved files from "common" into "default"' + errors.append(error_tpl % relative_js_path) if errors: header = 'Please add the tynymce editor configuration ' + \ -- cgit v1.2.3-1-g7c22