[#3833] Extend Flask template dirs #3860
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add additional template directories to template_loader during creation of Flask app stack. Previously we put list of additional dirs into `config['pylons.app_globals'].template_paths`, but as we are migrating to Flask I moved this value to `config['computed_template_paths']`. After this, inside `make_flask_app`, default `jinja_loader` replaced with ChoiceLoader, that will try to load templates from either default dirs or custom ones.
Generally, previous solution works, but template_loader created only once and not updated during dynamic plugin loading. New `CkanextTemplateLoader` inherits from `FileSystemLoader` but does not save path to template dir inside own property. Instead, property getter returns current state of config variable that contains template paths.
amercader
reviewed
Oct 11, 2017
ckan/config/middleware/flask_app.py
Outdated
| @@ -54,6 +57,13 @@ 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: | |||
There was a problem hiding this comment.
Shouldn't we use the ChoiceLoader always regardless of whether we have computed_template_paths in the config at this point?
Otherwise if you start CKAN without any plugin loaded at all you won't detect templates loaded at runtime, like in tests. I know this is impossible right now as we have "core plugins", but wondering if it makes more sense to future proof this.
There was a problem hiding this comment.
Yeah, it has sense. I prefer to keep things as simple as possible, but here we can allow permanent ChoiceLoader even if there is only one tpl source
|
This looks fantastic @smotornyuk, just one tiny question |
|
Updated. |
|
Thanks @smotornyuk! Good to have green tests again |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add additional template directories to template_loader during
creation of Flask app stack. Previously we put list of additional
dirs into
config['pylons.app_globals'].template_paths, butas we are migrating to Flask I moved this value to
config['computed_template_paths']. After this, insidemake_flask_app, defaultjinja_loaderreplaced with ChoiceLoader,that will try to load templates from either default dirs or custom
ones.