TagesschuleElementa/www.tagesschule-elementa.ch
3
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

upgrade aldryn-django-cms 3.5.3.3 to 3.6.0.7

Browse Source
This commit is contained in:
Divio Bot
2019-02-27 10:29:30 +00:00
parent dfa735b92a
commit d1d07282bb
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
addons/aldryn-django-cms/aldryn_config.py
View File

@@ -55,7 +55,7 @@ class Form(forms.BaseForm):
def to_settings(self, data, settings):
from functools import partial
from django.core.urlresolvers import reverse_lazy
from django.urls import reverse_lazy
from aldryn_addons.utils import boolean_ish, djsenv
env = partial(djsenv, settings=settings)
@@ -88,16 +88,10 @@ class Form(forms.BaseForm):
'djangocms_admin_style',
)
if is_django_18_or_later:
settings['TEMPLATES'][0]['OPTIONS']['context_processors'].extend([
'sekizai.context_processors.sekizai',
'cms.context_processors.cms_settings',
])
else:
settings['TEMPLATE_CONTEXT_PROCESSORS'].extend([
'sekizai.context_processors.sekizai',
'cms.context_processors.cms_settings',
])
settings['TEMPLATES'][0]['OPTIONS']['context_processors'].extend([
'sekizai.context_processors.sekizai',
'cms.context_processors.cms_settings',
])
middlewares = [
'cms.middleware.user.CurrentUserMiddleware',
@@ -108,10 +102,10 @@ class Form(forms.BaseForm):
if settings.get('MIDDLEWARE_CLASSES', None):
settings['MIDDLEWARE_CLASSES'].extend(middlewares)
settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',)
settings['MIDDLEWARE_CLASSES'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware', )
else:
settings['MIDDLEWARE'].extend(middlewares)
settings['MIDDLEWARE'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware',)
settings['MIDDLEWARE'].insert(0, 'cms.middleware.utils.ApphookReloadMiddleware', )
settings['ADDON_URLS_I18N_LAST'] = 'cms.urls'
@@ -189,19 +183,14 @@ class Form(forms.BaseForm):
)
settings['INSTALLED_APPS'].append('aldryn_boilerplates')
if is_django_18_or_later:
TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATES'][0]['OPTIONS']['context_processors']
TEMPLATE_LOADERS = settings['TEMPLATES'][0]['OPTIONS']['loaders']
else:
TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATE_CONTEXT_PROCESSORS']
TEMPLATE_LOADERS = settings['TEMPLATE_LOADERS']
TEMPLATE_CONTEXT_PROCESSORS = settings['TEMPLATES'][0]['OPTIONS']['context_processors']
TEMPLATE_LOADERS = settings['TEMPLATES'][0]['OPTIONS']['loaders']
TEMPLATE_CONTEXT_PROCESSORS.extend([
'aldryn_boilerplates.context_processors.boilerplate',
'aldryn_snake.template_api.template_processor',
])
TEMPLATE_LOADERS.insert(
TEMPLATE_LOADERS.index(
'django.template.loaders.app_directories.Loader'),
TEMPLATE_LOADERS.index('django.template.loaders.app_directories.Loader'),
'aldryn_boilerplates.template_loaders.AppDirectoriesLoader'
)