Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

2FA: Enable Django template backend. 

The only purpose of this commit is to make the django templates
of Two Factor Auth work. We probably won't need this commit once
we upgrade the admin backend of Two Factor Auth to use handlebar
templates.
This commit is contained in:
Umair Khan 2017-07-12 12:52:32 +05:00 committed by Tim Abbott
parent d1da4116ef
commit 9502cbbfab
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zproject/settings.py
View File

@ -491,6 +491,12 @@ ALLOWED_HOSTS += [EXTERNAL_HOST.split(":")[0],
# ... and with the hosts in REALM_HOSTS. # ... and with the hosts in REALM_HOSTS.
ALLOWED_HOSTS += REALM_HOSTS.values() ALLOWED_HOSTS += REALM_HOSTS.values()
from django.template.loaders import app_directories
class TwoFactorLoader(app_directories.Loader):
def get_dirs(self):
dirs = super(TwoFactorLoader, self).get_dirs()
return [d for d in dirs if 'two_factor' in d]
MIDDLEWARE = ( MIDDLEWARE = (
# With the exception of it's dependencies, # With the exception of it's dependencies,
# our logging middleware should be the top middleware item. # our logging middleware should be the top middleware item.
@ -1193,11 +1199,27 @@ non_html_template_engine_settings['OPTIONS'].update({
'lstrip_blocks': True, 'lstrip_blocks': True,
}) })
# django-two-factor uses the default Django template engine (not Jinja2), so we
# need to add config for it here.
two_factor_template_options = deepcopy(default_template_engine_settings['OPTIONS'])
del two_factor_template_options['environment']
del two_factor_template_options['extensions']
two_factor_template_options['loaders'] = ['zproject.settings.TwoFactorLoader']
two_factor_template_engine_settings = {
'NAME': 'Two_Factor',
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': False,
'OPTIONS': two_factor_template_options,
}
# The order here is important; get_template and related/parent functions try # The order here is important; get_template and related/parent functions try
# the template engines in order until one succeeds. # the template engines in order until one succeeds.
TEMPLATES = [ TEMPLATES = [
default_template_engine_settings, default_template_engine_settings,
non_html_template_engine_settings, non_html_template_engine_settings,
two_factor_template_engine_settings,
] ]
######################################################################## ########################################################################
# LOGGING SETTINGS # LOGGING SETTINGS