mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23441, #24555 -- Improved the behavior of InclusionNode.

Browse Source 
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.
This commit is contained in:
Preston Timmons
2015-03-31 21:57:26 -05:00
committed by Tim Graham
parent 4ea1909d3c
commit 0808ccce38
6 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/template/base.py
View File

@@ -1301,10 +1301,16 @@ class Library(object):
class InclusionNode(TagHelperNode):
def render(self, context):
"""
Renders the specified template and context. Caches the
template object in render_context to avoid reparsing and
loading when used in a for loop.
"""
resolved_args, resolved_kwargs = self.get_resolved_arguments(context)
_dict = func(*resolved_args, **resolved_kwargs)
if not getattr(self, 'nodelist', False):
t = context.render_context.get(self)
if t is None:
if isinstance(file_name, Template):
t = file_name
elif isinstance(getattr(file_name, 'template', None), Template):
@@ -1313,7 +1319,7 @@ class Library(object):
t = context.template.engine.select_template(file_name)
else:
t = context.template.engine.get_template(file_name)
self.nodelist = t.nodelist
context.render_context[self] = t
new_context = context.new(_dict)
# Copy across the CSRF token, if present, because
# inclusion tags are often used for forms, and we need
@@ -1322,7 +1328,7 @@ class Library(object):
csrf_token = context.get('csrf_token', None)
if csrf_token is not None:
new_context['csrf_token'] = csrf_token
return self.nodelist.render(new_context)
return t.render(new_context)
function_name = (name or
getattr(func, '_decorated_function', func).__name__)