diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py index ce400963fbc8ef2e0fbe8c4cf5470523d5884040..7d6a5bd4a02f796c0f5c876587b9361be71df5cd 100644 --- a/biscuit/core/settings.py +++ b/biscuit/core/settings.py @@ -42,6 +42,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'django_global_request', + 'settings_context_processor', 'sass_processor', 'easyaudit', 'bootstrap4', @@ -95,6 +96,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'settings_context_processor.context_processors.settings' ], }, }, @@ -229,4 +231,6 @@ COLOUR_DARK = _settings.get('theme.colours.dark', '#343a40') ADMINS = _settings.get('admins', []) +TEMPLATE_VISIBLE_SETTINGS = ['ADMINS'] + _settings.populate_obj(sys.modules[__name__]) diff --git a/biscuit/core/templates/error.html b/biscuit/core/templates/error.html index 5b02820c44b32594fb8eae2de7d8e72a4cd606af..ffdf79b1a46fdb1ec2579bd06ba5f2f78987ff3a 100644 --- a/biscuit/core/templates/error.html +++ b/biscuit/core/templates/error.html @@ -16,7 +16,7 @@ {% endblocktrans %} </p> <ul> - {% for admin in admins %} + {% for admin in ADMINS %} <li> {{ admin.0 }} < diff --git a/biscuit/core/views.py b/biscuit/core/views.py index 6a160314ddc63125ed1d9d2ca2b78cd8d4bd5b07..b81f2ef08cb908a9fb47856255b29b47d8d7b76a 100644 --- a/biscuit/core/views.py +++ b/biscuit/core/views.py @@ -21,7 +21,6 @@ def error_handler(status: int) -> Callable[..., HttpResponse]: context['status'] = status context['caption'] = _('Page not found') - context['admins'] = settings.ADMINS if status == 404: context['message'] = _('This page does not exist. If you were redirected by a link on an external page, it is possible that that link was outdated.') diff --git a/pyproject.toml b/pyproject.toml index e906aeaafce3e15fbcd316408546005619331eb6..49fa6946718897664981272eb617b704cfcfd67e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,7 @@ django-sass-processor = "^0.7.3" libsass = "^0.19.2" colour = "^0.1.5" dynaconf = {version = "^2.0", extras = ["yaml", "toml", "ini"]} +django-settings-context-processor = "^0.2" django-auth-ldap = { version = "^2.0", optional = true } [tool.poetry.extras]