From 95e33b7dc2c3fb6cd75d7fed472b66de916f16eb Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 15 Mar 2018 11:21:27 +0000 Subject: [PATCH] install djangocms-link 2.1.2 --- addons/djangocms-link/addon.json | 6 +++++ addons/djangocms-link/aldryn_config.py | 35 ++++++++++++++++++++++++++ addons/djangocms-link/settings.json | 3 +++ requirements.in | 1 + settings.py | 1 + 5 files changed, 46 insertions(+) create mode 100644 addons/djangocms-link/addon.json create mode 100644 addons/djangocms-link/aldryn_config.py create mode 100644 addons/djangocms-link/settings.json diff --git a/addons/djangocms-link/addon.json b/addons/djangocms-link/addon.json new file mode 100644 index 0000000..c6a1707 --- /dev/null +++ b/addons/djangocms-link/addon.json @@ -0,0 +1,6 @@ +{ + "installed-apps": [ + "djangocms_link" + ], + "package-name": "djangocms-link" +} \ No newline at end of file diff --git a/addons/djangocms-link/aldryn_config.py b/addons/djangocms-link/aldryn_config.py new file mode 100644 index 0000000..25d0693 --- /dev/null +++ b/addons/djangocms-link/aldryn_config.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +from aldryn_client import forms + + +def split_and_strip(string): + return [item.strip() for item in string.split(',') if item] + + +class Form(forms.BaseForm): + templates = forms.CharField( + 'List of additional templates (comma separated)', + required=False, + ) + """ + The following settings need to be configured on your project separately + as we don't want to expose them as aldryn configurations yet: + DJANGOCMS_LINK_INTRANET_HOSTNAME_PATTERN + DJANGOCMS_LINK_USE_SELECT2 + """ + + def clean(self): + data = super(Form, self).clean() + + # prettify + data['templates'] = ', '.join(split_and_strip(data['templates'])) + return data + + def to_settings(self, data, settings): + if data['templates']: + settings['DJANGOCMS_LINK_TEMPLATES'] = [ + (item, item) + for item in split_and_strip(data['templates']) + ] + + return settings diff --git a/addons/djangocms-link/settings.json b/addons/djangocms-link/settings.json new file mode 100644 index 0000000..d9f69d2 --- /dev/null +++ b/addons/djangocms-link/settings.json @@ -0,0 +1,3 @@ +{ + "templates": null +} \ No newline at end of file diff --git a/requirements.in b/requirements.in index 37bcd08..b5b32c6 100644 --- a/requirements.in +++ b/requirements.in @@ -2,6 +2,7 @@ https://control.divio.com/api/v1/apps/serve/aldryn-addons/1.0.2/24f5d1c8-66fe-43b2-a540-17d61045a72b/aldryn-addons-1.0.2.tar.gz#egg=aldryn-addons==1.0.2 https://control.divio.com/api/v1/apps/serve/aldryn-django/1.8.19.1/5dfa4420-e075-4377-a4b7-9feeaa3f5efb/aldryn-django-1.8.19.1.tar.gz#egg=aldryn-django==1.8.19.1 https://control.divio.com/api/v1/apps/serve/aldryn-sso/1.1.16/dbe0c45a-c981-4beb-8624-b0d2c4196aa0/aldryn-sso-1.1.16.tar.gz#egg=aldryn-sso==1.1.16 +https://control.divio.com/api/v1/apps/serve/djangocms-link/2.1.2/35b986c1-fafb-46ee-b665-aa36603f233a/djangocms-link-2.1.2.tar.gz#egg=djangocms-link==2.1.2 https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.5.3/a7b5179f-cea5-4af8-b235-6b7f709c4e6a/djangocms-text-ckeditor-3.5.3.tar.gz#egg=djangocms-text-ckeditor==3.5.3 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.0.1/bcb7d25b-6922-48a9-a252-9bc165f6403e/django-filer-1.3.0.1.tar.gz#egg=django-filer==1.3.0.1 # diff --git a/settings.py b/settings.py index da1e501..2a87ec0 100644 --- a/settings.py +++ b/settings.py @@ -5,6 +5,7 @@ INSTALLED_ADDONS = [ 'aldryn-addons', 'aldryn-django', 'aldryn-sso', + 'djangocms-link', 'djangocms-text-ckeditor', 'django-filer', #