From 1a116e9d5c42873d6fd4443ce0ba321116492d05 Mon Sep 17 00:00:00 2001 From: Melvyn Sopacua Date: Sat, 30 Mar 2019 14:31:31 +0100 Subject: [PATCH] feat(make-jquery-urls-configurable): Add settings Add 3 new settings, without prefix that deal with external resources. This allows software with elevated security restrictions to function properly. --- modeltranslation/admin.py | 10 +++++----- modeltranslation/settings.py | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modeltranslation/admin.py b/modeltranslation/admin.py index 1a7aa4b..9e9ee56 100755 --- a/modeltranslation/admin.py +++ b/modeltranslation/admin.py @@ -359,8 +359,8 @@ class TabbedDjangoJqueryTranslationAdmin(TranslationAdmin): class Media: js = ( 'modeltranslation/js/force_jquery.js', - '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js', - '//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js', + mt_settings.JQUERY_UI_URL, + mt_settings.JQUERY_MB_BROWSER_URL, 'modeltranslation/js/tabbed_translation_fields.js', ) css = { @@ -375,9 +375,9 @@ class TabbedExternalJqueryTranslationAdmin(TranslationAdmin): """ class Media: js = ( - '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js', - '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js', - '//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js', + mt_settings.JQUERY_URL, + mt_settings.JQUERY_UI_URL, + mt_settings.JQUERY_MB_BROWSER_URL, 'modeltranslation/js/tabbed_translation_fields.js', ) css = { diff --git a/modeltranslation/settings.py b/modeltranslation/settings.py index 309075d..d32266f 100644 --- a/modeltranslation/settings.py +++ b/modeltranslation/settings.py @@ -54,3 +54,10 @@ for key, value in FALLBACK_LANGUAGES.items(): ENABLE_FALLBACKS = getattr(settings, 'MODELTRANSLATION_ENABLE_FALLBACKS', True) LOADDATA_RETAIN_LOCALE = getattr(settings, 'MODELTRANSLATION_LOADDATA_RETAIN_LOCALE', True) + +JQUERY_URL = getattr(settings, 'JQUERY_URL', + '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js') +JQUERY_UI_URL = getattr(settings, 'JQUERY_UI_URL', + '//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js') +JQUERY_MB_BROWSER_URL = getattr(settings, 'JQUERY_MB_BROWSER_URL', + '//cdn.jsdelivr.net/jquery.mb.browser/0.1/jquery.mb.browser.min.js')