From b59958b4f51a4e744cdd6cc07170df624ab96d8a Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Mon, 17 Feb 2014 19:13:25 +0100 Subject: [PATCH] searching for template vars dict in TEMPLATE_VARS attribute from *settings* --- passerelle/base/context_processors.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/passerelle/base/context_processors.py b/passerelle/base/context_processors.py index 6d4cfcc..7309d5c 100644 --- a/passerelle/base/context_processors.py +++ b/passerelle/base/context_processors.py @@ -1,9 +1,17 @@ # -*- coding: utf-8 -*- +from django.conf import settings +from .models import TemplateVar + def template_vars(request): """ returns a dict with all the template vars """ - from .models import TemplateVar - - return dict((obj.name, obj.value) for obj in TemplateVar.objects.all()) + vars = {} + try: + vars.update(settings.TEMPLATE_VARS) + except AttributeError: + pass + finally: + vars.update(dict((obj.name, obj.value) for obj in TemplateVar.objects.all())) + return vars -- 1.9.0.rc3