From e6377a1243ac25c1d0eec05c0bdc9ea7e7f2a1ad Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 9 May 2013 14:31:08 -0400 Subject: [PATCH] Fix lingering import statement, add context processor to expose settings to templates. --- lib/main/models/__init__.py | 1 - lib/settings/defaults.py | 1 + lib/ui/context_processors.py | 6 ++++++ lib/ui/templates/ui/index.html | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 lib/ui/context_processors.py diff --git a/lib/main/models/__init__.py b/lib/main/models/__init__.py index a004011cef..e8d34c920a 100644 --- a/lib/main/models/__init__.py +++ b/lib/main/models/__init__.py @@ -30,7 +30,6 @@ from jsonfield import JSONField from djcelery.models import TaskMeta from rest_framework.authtoken.models import Token import yaml -from lib.main.fields import * # TODO: reporting model TBD diff --git a/lib/settings/defaults.py b/lib/settings/defaults.py index a69bd3e8b4..3b8ffb1e5c 100644 --- a/lib/settings/defaults.py +++ b/lib/settings/defaults.py @@ -118,6 +118,7 @@ ALLOWED_HOSTS = [] TEMPLATE_CONTEXT_PROCESSORS += ( 'django.core.context_processors.request', + 'lib.ui.context_processors.settings', ) MIDDLEWARE_CLASSES += ( diff --git a/lib/ui/context_processors.py b/lib/ui/context_processors.py new file mode 100644 index 0000000000..ff39d5389d --- /dev/null +++ b/lib/ui/context_processors.py @@ -0,0 +1,6 @@ +from django.conf import settings as django_settings + +def settings(request): + return { + 'settings': django_settings, + } diff --git a/lib/ui/templates/ui/index.html b/lib/ui/templates/ui/index.html index 72ef7f1829..766fa70a8f 100644 --- a/lib/ui/templates/ui/index.html +++ b/lib/ui/templates/ui/index.html @@ -13,7 +13,7 @@ - {% if not debug %} + {% if not settings.DEBUG %} {% else %}