Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use blueprint specified template folder #1537

Closed
wants to merge 5 commits into from
Closed

use blueprint specified template folder #1537

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1adf900
use blueprint specified template folder
alanhamlett Jul 17, 2015
849fdb2
use already imported request and app from ctx stack
alanhamlett Jul 21, 2015
4d3a144
add newline back to docstring
alanhamlett Jul 21, 2015
f952e58
use blueprint from request object
alanhamlett Jul 21, 2015
3cbb0ed
make sure bp.jinja_loader is not None
alanhamlett Aug 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions flask/templating.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from jinja2 import BaseLoader, Environment as BaseEnvironment, \
TemplateNotFound

from ._compat import string_types
from .globals import _request_ctx_stack, _app_ctx_stack
from .signals import template_rendered, before_render_template

Expand Down Expand Up @@ -121,8 +122,26 @@ def render_template(template_name_or_list, **context):
"""
ctx = _app_ctx_stack.top
ctx.app.update_template_context(context)
return _render(ctx.app.jinja_env.get_or_select_template(template_name_or_list),
context, ctx.app)

template = None

if _request_ctx_stack.top is not None and \
_request_ctx_stack.top.request.blueprint is not None and \
isinstance(template_name_or_list, string_types):
bp = ctx.app.blueprints[_request_ctx_stack.top.request.blueprint]
if bp.jinja_loader is not None:
try:
template = bp.jinja_loader.load(ctx.app.jinja_env,
template_name_or_list,
ctx.app.jinja_env.globals)
except TemplateNotFound:
pass

if template is None:
template = ctx.app.jinja_env\
.get_or_select_template(template_name_or_list)

return _render(template, context, ctx.app)


def render_template_string(source, **context):
Expand Down