From cdec7d0d568ea1f25824cb7cb6d04e89db0ab630 Mon Sep 17 00:00:00 2001 From: Divio Bot Date: Thu, 14 Feb 2019 16:46:30 +0000 Subject: [PATCH] upgrade aldryn-django 1.11.15.1 to 1.11.20.1 --- addons/aldryn-django/addon.json | 2 +- addons/aldryn-django/aldryn_config.py | 7 +++++++ addons/aldryn-django/settings.json | 8 ++++---- requirements.in | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/addons/aldryn-django/addon.json b/addons/aldryn-django/addon.json index e5e0abe..7e97852 100644 --- a/addons/aldryn-django/addon.json +++ b/addons/aldryn-django/addon.json @@ -1,4 +1,4 @@ { - "installed-apps": [], + "installed-apps": [], "package-name": "aldryn-django" } \ No newline at end of file diff --git a/addons/aldryn-django/aldryn_config.py b/addons/aldryn-django/aldryn_config.py index ce2e926..3566ee0 100644 --- a/addons/aldryn-django/aldryn_config.py +++ b/addons/aldryn-django/aldryn_config.py @@ -2,8 +2,10 @@ import json import os import sys + from aldryn_client import forms + SYSTEM_FIELD_WARNING = 'WARNING: this field is auto-written. Please do not change it here.' @@ -223,6 +225,8 @@ class Form(forms.BaseForm): return settings def domain_settings(self, data, settings, env): + from aldryn_addons.utils import boolean_ish + settings['ALLOWED_HOSTS'] = env('ALLOWED_HOSTS', ['localhost', '*']) # will take a full config dict from ALDRYN_SITES_DOMAINS if available, # otherwise fall back to constructing the dict from DOMAIN, @@ -232,6 +236,8 @@ class Form(forms.BaseForm): settings['DOMAIN'] = domain domains = env('ALDRYN_SITES_DOMAINS', {}) + permanent_redirect = boolean_ish(env('ALDRYN_SITES_REDIRECT_PERMANENT', False)) + if not domains and domain: domain_aliases = [ d.strip() @@ -252,6 +258,7 @@ class Form(forms.BaseForm): }, } settings['ALDRYN_SITES_DOMAINS'] = domains + settings['ALDRYN_SITES_REDIRECT_PERMANENT'] = permanent_redirect # This is ensured again by aldryn-sites, but we already do it here # as we need the full list of domains later when configuring diff --git a/addons/aldryn-django/settings.json b/addons/aldryn-django/settings.json index bce322c..f081931 100644 --- a/addons/aldryn-django/settings.json +++ b/addons/aldryn-django/settings.json @@ -1,7 +1,7 @@ { - "disable_default_language_prefix": false, - "enable_gis": false, - "languages": "[\"de\", \"en\"]", - "session_timeout": "", + "disable_default_language_prefix": false, + "enable_gis": false, + "languages": "[\"de\", \"en\"]", + "session_timeout": "", "use_manifeststaticfilesstorage": true } \ No newline at end of file diff --git a/requirements.in b/requirements.in index 9c0ee4f..f726631 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ # # Warning: text inside the INSTALLED_ADDONS tags is auto-generated. Manual changes will be overwritten. 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.15.1/f9e543d2-3127-4458-b0f5-d69d282bf0ac/aldryn-django-1.11.15.1.tar.gz#egg=aldryn-django==1.11.15.1 +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-forms/3.0.4/7e972f96-36f6-484b-96c7-bce255b87aa9/aldryn-forms-3.0.4.tar.gz#egg=aldryn-forms==3.0.4