From e92e43bd326c0d866e9b2969741611cff963ace2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= Date: Fri, 24 May 2013 12:19:39 +0200 Subject: [PATCH] Replaced appVersionContext with templateContext with get variables from settings.TEMPLATE_CONTEXT as tuples of key, value --- minecraftcodex/herobrine/context.py | 13 +++++-------- minecraftcodex/herobrine/settings.py | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/minecraftcodex/herobrine/context.py b/minecraftcodex/herobrine/context.py index 21e9def..6f55831 100644 --- a/minecraftcodex/herobrine/context.py +++ b/minecraftcodex/herobrine/context.py @@ -1,11 +1,8 @@ -from os import environ +from django.conf import settings - -def AppVersionContext(request): +def templateContext(request): result = {} - if 'APP_VERSION' in environ: - result = { - 'app_version': environ['APP_VERSION'] - } - + if hasattr(settings, 'TEMPLATE_CONTEXT'): + for item in settings.TEMPLATE_CONTEXT: + result[item[0]] = item[1] return result diff --git a/minecraftcodex/herobrine/settings.py b/minecraftcodex/herobrine/settings.py index 46022f7..ca67399 100644 --- a/minecraftcodex/herobrine/settings.py +++ b/minecraftcodex/herobrine/settings.py @@ -94,7 +94,7 @@ TEMPLATE_LOADERS = ( ) TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( - 'herobrine.context.AppVersionContext', + 'herobrine.context.templateContext', ) JINGO_INCLUDE_PATTERN = r'\.html'