From 59d5d16e743a326f285dcb661a7618b292e270b2 Mon Sep 17 00:00:00 2001 From: Divio Bot Date: Thu, 14 Feb 2019 16:48:19 +0000 Subject: [PATCH] upgrade aldryn-django-cms 3.5.2.2 to 3.5.3.3 --- addons/aldryn-django-cms/addon.json | 2 +- addons/aldryn-django-cms/aldryn_config.py | 12 +++++++++--- addons/aldryn-django-cms/settings.json | 8 ++++---- requirements.in | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/addons/aldryn-django-cms/addon.json b/addons/aldryn-django-cms/addon.json index 694440f..5db1b3f 100644 --- a/addons/aldryn-django-cms/addon.json +++ b/addons/aldryn-django-cms/addon.json @@ -1,6 +1,6 @@ { "installed-apps": [ "filer.contrib.django_cms" - ], + ], "package-name": "aldryn-django-cms" } \ No newline at end of file diff --git a/addons/aldryn-django-cms/aldryn_config.py b/addons/aldryn-django-cms/aldryn_config.py index 3fc7113..ec3b55b 100644 --- a/addons/aldryn-django-cms/aldryn_config.py +++ b/addons/aldryn-django-cms/aldryn_config.py @@ -99,13 +99,19 @@ class Form(forms.BaseForm): 'cms.context_processors.cms_settings', ]) - settings['MIDDLEWARE_CLASSES'].extend([ + middlewares = [ 'cms.middleware.user.CurrentUserMiddleware', 'cms.middleware.page.CurrentPageMiddleware', 'cms.middleware.toolbar.ToolbarMiddleware', 'cms.middleware.language.LanguageCookieMiddleware', - ]) - settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',) + ] + + if settings.get('MIDDLEWARE_CLASSES', None): + settings['MIDDLEWARE_CLASSES'].extend(middlewares) + settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',) + else: + settings['MIDDLEWARE'].extend(middlewares) + settings['MIDDLEWARE'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',) settings['ADDON_URLS_I18N_LAST'] = 'cms.urls' diff --git a/addons/aldryn-django-cms/settings.json b/addons/aldryn-django-cms/settings.json index a411a61..fb66ff4 100644 --- a/addons/aldryn-django-cms/settings.json +++ b/addons/aldryn-django-cms/settings.json @@ -1,7 +1,7 @@ { - "boilerplate_name": "baker-street_gulp-scss", - "cms_content_cache_duration": 60, - "cms_menus_cache_duration": 3600, - "cms_templates": "[]", + "boilerplate_name": "baker-street_gulp-scss", + "cms_content_cache_duration": 60, + "cms_menus_cache_duration": 3600, + "cms_templates": "[]", "permissions_enabled": true } \ No newline at end of file diff --git a/requirements.in b/requirements.in index f726631..7ea2cc6 100644 --- a/requirements.in +++ b/requirements.in @@ -2,7 +2,7 @@ https://control.divio.com/api/v1/apps/serve/aldryn-addons/1.0.4/5cc40a55-a1e5-4906-a8df-03a1029a62f5/aldryn-addons-1.0.4.tar.gz#egg=aldryn-addons==1.0.4 https://control.divio.com/api/v1/apps/serve/aldryn-django/1.11.20.1/81a21283-635d-457e-a4c0-668dff0a483a/aldryn-django-1.11.20.1.tar.gz#egg=aldryn-django==1.11.20.1 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.4.5/ac81fefa-4a6b-4d42-804a-24f5056481de/aldryn-sso-1.4.5.tar.gz#egg=aldryn-sso==1.4.5 -https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.2.2/88bf7991-90a3-4c98-acf5-42c3fa14e2a4/aldryn-django-cms-3.5.2.2.tar.gz#egg=aldryn-django-cms==3.5.2.2 +https://control.divio.com/api/v1/apps/serve/aldryn-django-cms/3.5.3.3/0d70ac86-cd2b-4406-8272-88f466e08ac5/aldryn-django-cms-3.5.3.3.tar.gz#egg=aldryn-django-cms==3.5.3.3 https://control.divio.com/api/v1/apps/serve/aldryn-forms/3.0.4/7e972f96-36f6-484b-96c7-bce255b87aa9/aldryn-forms-3.0.4.tar.gz#egg=aldryn-forms==3.0.4 https://control.divio.com/api/v1/apps/serve/aldryn-haystack/0.5.1/bf04cc01-9855-4659-843e-05379cec9ac6/aldryn-haystack-0.5.1.tar.gz#egg=aldryn-haystack==0.5.1 https://control.divio.com/api/v1/apps/serve/djangocms-history/0.5.3/05803675-6e8d-4637-b14b-1bb8d18b24b3/djangocms-history-0.5.3.tar.gz#egg=djangocms-history==0.5.3