entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

misc: declare TEMPLATE_VARS for real (#14880)

This commit is contained in:
Frédéric Péters 2017-02-03 14:52:17 +01:00
parent dc4ba9b8b9
commit fe831e5d68
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/context_processors.py
View File

@ -18,4 +18,4 @@
from django.conf import settings
def template_vars(request):
return getattr(settings, 'TEMPLATE_VARS', {})
return settings.TEMPLATE_VARS

4
combo/manager/views.py
View File

@ -400,8 +400,8 @@ def asset_delete(request):
def menu_json(request):
if getattr(settings, 'TEMPLATE_VARS', {}).get('site_title'):
label = _('Editing %(site_title)s') % getattr(settings, 'TEMPLATE_VARS')
if settings.TEMPLATE_VARS.get('site_title'):
label = _('Editing %(site_title)s') % settings.TEMPLATE_VARS
else:
label = _('Content Management')
json_str = json.dumps([{'label': force_text(label),

3
combo/settings.py
View File

@ -217,6 +217,9 @@ COMBO_PUBLIC_TEMPLATES = {
},
}
# extra variables for templates
TEMPLATE_VARS = {}
# Authentication settings
try:
import mellon

2
tests/settings.py
View File

@ -21,8 +21,6 @@ MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
LINGO_API_SIGN_KEY = '12345'
LINGO_SIGNATURE_KEY = '54321'
TEMPLATE_VARS = {}
import tempfile
MEDIA_ROOT = tempfile.mkdtemp('combo-test')