From 53d79167724d7f398e37b5bc927b4f2a6fbe4c99 Mon Sep 17 00:00:00 2001 From: Basraah Date: Sat, 23 Sep 2017 11:32:32 +1000 Subject: [PATCH] Move context processor --- alliance_auth/settings.py.example | 2 +- allianceauth/context_processors.py | 15 +++++++++++++++ allianceauth/services/context_processors.py | 19 ------------------- test_allianceauth/settings.py | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 allianceauth/context_processors.py delete mode 100644 allianceauth/services/context_processors.py diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index df9e09d4..e6e2f5a4 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -135,7 +135,7 @@ TEMPLATES = [ 'django.template.context_processors.media', 'django.template.context_processors.static', 'django.template.context_processors.tz', - 'allianceauth.services.context_processors.auth_settings', + 'allianceauth.context_processors.auth_settings', 'allianceauth.notifications.context_processors.user_notification_count', 'allianceauth.groupmanagement.context_processors.can_manage_groups', ], diff --git a/allianceauth/context_processors.py b/allianceauth/context_processors.py new file mode 100644 index 00000000..b0e1d947 --- /dev/null +++ b/allianceauth/context_processors.py @@ -0,0 +1,15 @@ +from django.conf import settings +from django.utils import timezone + + +def auth_settings(request): + return { + 'DOMAIN': settings.DOMAIN, + + 'IPS4_URL': getattr(settings, 'IPS4_URL', ''), + 'SMF_URL': getattr(settings, 'SMF_URL', ''), + 'MARKET_URL': getattr(settings, 'MARKET_URL', ''), + 'CURRENT_UTC_TIME': timezone.now(), + 'JABBER_URL': getattr(settings, 'JABBER_URL', ''), + 'SITE_NAME': settings.SITE_NAME, + } diff --git a/allianceauth/services/context_processors.py b/allianceauth/services/context_processors.py deleted file mode 100644 index a87de060..00000000 --- a/allianceauth/services/context_processors.py +++ /dev/null @@ -1,19 +0,0 @@ -from django.conf import settings -from django.utils import timezone - - -def auth_settings(request): - return { - 'DOMAIN': settings.DOMAIN, - 'MUMBLE_URL': settings.MUMBLE_URL, - 'FORUM_URL': settings.PHPBB3_URL, - 'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL, - 'DISCORD_SERVER_ID': settings.DISCORD_GUILD_ID, - 'DISCOURSE_URL': settings.DISCOURSE_URL, - 'IPS4_URL': settings.IPS4_URL, - 'SMF_URL': settings.SMF_URL, - 'MARKET_URL': settings.MARKET_URL, - 'CURRENT_UTC_TIME': timezone.now(), - 'JABBER_URL': settings.JABBER_URL, - 'SITE_NAME': settings.SITE_NAME, - } diff --git a/test_allianceauth/settings.py b/test_allianceauth/settings.py index 1e11cb20..dedf1f66 100644 --- a/test_allianceauth/settings.py +++ b/test_allianceauth/settings.py @@ -109,7 +109,7 @@ TEMPLATES = [ 'django.template.context_processors.media', 'django.template.context_processors.static', 'django.template.context_processors.tz', - 'allianceauth.services.context_processors.auth_settings', + 'allianceauth.context_processors.auth_settings', 'allianceauth.notifications.context_processors.user_notification_count', 'allianceauth.groupmanagement.context_processors.can_manage_groups', ],