From 0963ec90ae423faf46f182afdbb22ca6d4ca80ad Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 15 Mar 2018 11:21:21 +0000 Subject: [PATCH] install django-filer 1.3.0.1 --- addons/django-filer/addon.json | 9 +++++ addons/django-filer/aldryn_config.py | 53 ++++++++++++++++++++++++++++ addons/django-filer/settings.json | 1 + requirements.in | 1 + settings.py | 1 + 5 files changed, 65 insertions(+) create mode 100644 addons/django-filer/addon.json create mode 100644 addons/django-filer/aldryn_config.py create mode 100644 addons/django-filer/settings.json diff --git a/addons/django-filer/addon.json b/addons/django-filer/addon.json new file mode 100644 index 0000000..c733d40 --- /dev/null +++ b/addons/django-filer/addon.json @@ -0,0 +1,9 @@ +{ + "installed-apps": [ + "filer", + "easy_thumbnails", + "mptt", + "polymorphic" + ], + "package-name": "django-filer" +} \ No newline at end of file diff --git a/addons/django-filer/aldryn_config.py b/addons/django-filer/aldryn_config.py new file mode 100644 index 0000000..f4776d5 --- /dev/null +++ b/addons/django-filer/aldryn_config.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +from aldryn_client import forms + + +class Form(forms.BaseForm): + + def to_settings(self, data, settings): + from functools import partial + from aldryn_addons.utils import boolean_ish, djsenv + from aldryn_django import storage + + env = partial(djsenv, settings=settings) + + # django-filer + settings['FILER_DEBUG'] = boolean_ish(env('FILER_DEBUG', settings['DEBUG'])) + settings['FILER_ENABLE_LOGGING'] = boolean_ish(env('FILER_ENABLE_LOGGING', True)) + settings['FILER_IMAGE_USE_ICON'] = True + settings['ADDON_URLS'].append( + 'filer.server.urls' + ) + settings.setdefault('MEDIA_HEADERS', []).insert(0, ( + r'filer_public(?:_thumbnails)?/.*', + { + 'Cache-Control': 'public, max-age={}'.format(86400 * 365), + }, + )) + + # easy-thumbnails + settings['THUMBNAIL_QUALITY'] = env('THUMBNAIL_QUALITY', 90) + # FIXME: enabling THUMBNAIL_HIGH_RESOLUTION causes timeouts/500! + settings['THUMBNAIL_HIGH_RESOLUTION'] = False + settings['THUMBNAIL_PRESERVE_EXTENSIONS'] = ['png', 'gif'] + settings['THUMBNAIL_PROCESSORS'] = ( + 'easy_thumbnails.processors.colorspace', + 'easy_thumbnails.processors.autocrop', + 'filer.thumbnail_processors.scale_and_crop_with_subject_location', + 'easy_thumbnails.processors.filters', + ) + settings['THUMBNAIL_SOURCE_GENERATORS'] = ( + 'easy_thumbnails.source_generators.pil_image', + ) + settings['THUMBNAIL_CACHE_DIMENSIONS'] = True + + # easy_thumbnails uses django's default storage backend (local file + # system storage) by default, even if the DEFAULT_FILE_STORAGE setting + # points to something else. + # If the DEFAULT_FILE_STORAGE has been set to a value known by + # aldryn-django, then use that as THUMBNAIL_DEFAULT_STORAGE as well. + for storage_backend in storage.SCHEMES.values(): + if storage_backend == settings['DEFAULT_FILE_STORAGE']: + settings['THUMBNAIL_DEFAULT_STORAGE'] = storage_backend + break + return settings diff --git a/addons/django-filer/settings.json b/addons/django-filer/settings.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/addons/django-filer/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/requirements.in b/requirements.in index 1850388..8766aa9 100644 --- a/requirements.in +++ b/requirements.in @@ -2,4 +2,5 @@ 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/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 844f7f5..fa2df1d 100644 --- a/settings.py +++ b/settings.py @@ -5,6 +5,7 @@ INSTALLED_ADDONS = [ 'aldryn-addons', 'aldryn-django', 'aldryn-sso', + 'django-filer', # ]