From 42a8492928b3c0af076ec37b69487e355837020e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Pito=C5=84?= Date: Sat, 20 May 2023 15:02:10 +0200 Subject: [PATCH] Move context processors from deployments settings to `misago.settings` (#1598) * Move context processors list to misago.settings * Format code with black * Rename CONTEXT_PROCESSORS to TEMPLATE_CONTEXT_PROCESSORS --- devproject/settings.py | 35 +---------------------------------- misago/settings.py | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/devproject/settings.py b/devproject/settings.py index d87cf4f545..e6fb14c682 100644 --- a/devproject/settings.py +++ b/devproject/settings.py @@ -241,40 +241,7 @@ "DIRS": [], "APP_DIRS": True, "OPTIONS": { - "context_processors": [ - "django.template.context_processors.debug", - "django.template.context_processors.i18n", - "django.template.context_processors.media", - "django.template.context_processors.request", - "django.template.context_processors.static", - "django.template.context_processors.tz", - "django.contrib.auth.context_processors.auth", - "django.contrib.messages.context_processors.messages", - "misago.acl.context_processors.user_acl", - "misago.conf.context_processors.conf", - "misago.conf.context_processors.og_image", - "misago.core.context_processors.misago_version", - "misago.core.context_processors.request_path", - "misago.core.context_processors.momentjs_locale", - "misago.icons.context_processors.icons", - "misago.search.context_processors.search_providers", - "misago.themes.context_processors.theme", - "misago.legal.context_processors.legal_links", - "misago.menus.context_processors.menus", - "misago.users.context_processors.user_links", - "misago.core.context_processors.hooks", - # Data preloaders - "misago.conf.context_processors.preload_settings_json", - "misago.core.context_processors.current_link", - "misago.markup.context_processors.preload_api_url", - "misago.threads.context_processors.preload_threads_urls", - "misago.users.context_processors.preload_user_json", - "misago.categories.context_processors.preload_categories_json", - "misago.socialauth.context_processors.preload_socialauth_json", - # Note: keep frontend_context processor last for previous processors - # to be able to expose data UI app via request.frontend_context - "misago.core.context_processors.frontend_context", - ] + "context_processors": TEMPLATE_CONTEXT_PROCESSORS, }, } ] diff --git a/misago/settings.py b/misago/settings.py index 7f85227d04..7f04457d4c 100644 --- a/misago/settings.py +++ b/misago/settings.py @@ -1,7 +1,8 @@ -"""Misago's default Django Project settings""" +"""Misago's default Django Project settings.""" __all__ = [ "INSTALLED_APPS", + "TEMPLATE_CONTEXT_PROCESSORS", ] INSTALLED_APPS = [ @@ -48,3 +49,38 @@ "misago.plugins", "misago.apiv2", ] + +TEMPLATE_CONTEXT_PROCESSORS = [ + "django.template.context_processors.debug", + "django.template.context_processors.i18n", + "django.template.context_processors.media", + "django.template.context_processors.request", + "django.template.context_processors.static", + "django.template.context_processors.tz", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", + "misago.acl.context_processors.user_acl", + "misago.conf.context_processors.conf", + "misago.conf.context_processors.og_image", + "misago.core.context_processors.misago_version", + "misago.core.context_processors.request_path", + "misago.core.context_processors.momentjs_locale", + "misago.icons.context_processors.icons", + "misago.search.context_processors.search_providers", + "misago.themes.context_processors.theme", + "misago.legal.context_processors.legal_links", + "misago.menus.context_processors.menus", + "misago.users.context_processors.user_links", + "misago.core.context_processors.hooks", + # Data preloaders + "misago.conf.context_processors.preload_settings_json", + "misago.core.context_processors.current_link", + "misago.markup.context_processors.preload_api_url", + "misago.threads.context_processors.preload_threads_urls", + "misago.users.context_processors.preload_user_json", + "misago.categories.context_processors.preload_categories_json", + "misago.socialauth.context_processors.preload_socialauth_json", + # Note: keep frontend_context processor last for previous processors + # to be able to expose data UI app via request.frontend_context + "misago.core.context_processors.frontend_context", +]