From 5cb2ddf23e70b22afa5765864de4fbecde2b2d8e Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 15 Mar 2018 11:21:32 +0000 Subject: [PATCH] install djangocms-googlemap 1.1.0 --- addons/djangocms-googlemap/addon.json | 6 ++++ addons/djangocms-googlemap/aldryn_config.py | 35 +++++++++++++++++++++ addons/djangocms-googlemap/settings.json | 4 +++ requirements.in | 1 + settings.py | 1 + 5 files changed, 47 insertions(+) create mode 100644 addons/djangocms-googlemap/addon.json create mode 100644 addons/djangocms-googlemap/aldryn_config.py create mode 100644 addons/djangocms-googlemap/settings.json diff --git a/addons/djangocms-googlemap/addon.json b/addons/djangocms-googlemap/addon.json new file mode 100644 index 0000000..e1fac7b --- /dev/null +++ b/addons/djangocms-googlemap/addon.json @@ -0,0 +1,6 @@ +{ + "installed-apps": [ + "djangocms_googlemap" + ], + "package-name": "djangocms-googlemap" +} \ No newline at end of file diff --git a/addons/djangocms-googlemap/aldryn_config.py b/addons/djangocms-googlemap/aldryn_config.py new file mode 100644 index 0000000..c0feec0 --- /dev/null +++ b/addons/djangocms-googlemap/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, + ) + api_key = forms.CharField( + 'You need to provide a valid Google Maps API key ' + 'https://developers.google.com/maps/documentation/javascript/get-api-key', + required=True, + ) + + 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_GOOGLEMAP_TEMPLATES'] = [ + (item, item) + for item in split_and_strip(data['templates']) + ] + if data['api_key']: + settings['DJANGOCMS_GOOGLEMAP_API_KEY'] = data['api_key'] + + return settings diff --git a/addons/djangocms-googlemap/settings.json b/addons/djangocms-googlemap/settings.json new file mode 100644 index 0000000..1a21ead --- /dev/null +++ b/addons/djangocms-googlemap/settings.json @@ -0,0 +1,4 @@ +{ + "api_key": null, + "templates": null +} \ No newline at end of file diff --git a/requirements.in b/requirements.in index fb89b22..333e50a 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-googlemap/1.1.0/829bcfeb-0edc-4074-9483-88c27410d154/djangocms-googlemap-1.1.0.tar.gz#egg=djangocms-googlemap==1.1.0 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-snippet/2.0.0/03734ae6-5d3e-44aa-8641-8f764dbced64/djangocms-snippet-2.0.0.tar.gz#egg=djangocms-snippet==2.0.0 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 diff --git a/settings.py b/settings.py index b3de204..705653d 100644 --- a/settings.py +++ b/settings.py @@ -5,6 +5,7 @@ INSTALLED_ADDONS = [ 'aldryn-addons', 'aldryn-django', 'aldryn-sso', + 'djangocms-googlemap', 'djangocms-link', 'djangocms-snippet', 'djangocms-text-ckeditor',