Skip to content

Commit

Permalink
Always use ChoiceLoader
Browse files Browse the repository at this point in the history
  • Loading branch information
smotornyuk committed Oct 11, 2017
1 parent e860da3 commit bfcbade
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions ckan/config/middleware/flask_app.py
Expand Up @@ -57,13 +57,10 @@ def make_flask_stack(conf, **app_conf):
app.template_folder = os.path.join(root, 'templates')
app.app_ctx_globals_class = CKAN_AppCtxGlobals
app.url_rule_class = CKAN_Rule
extra_paths = config.get('computed_template_paths')

if extra_paths:
app.jinja_loader = ChoiceLoader([
app.jinja_loader,
CkanextTemplateLoader()
])
app.jinja_loader = ChoiceLoader([
app.jinja_loader,
CkanextTemplateLoader()
])

# Update Flask config with the CKAN values. We use the common config
# object as values might have been modified on `load_environment`
Expand Down

0 comments on commit bfcbade

Please sign in to comment.