matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'revert-273f94e9' into 'master'

Browse Source 
Revert "Merge branch 'fix-context' into 'master'"

See merge request !21
This commit is contained in:
Roberto Rosario
2017-09-07 05:14:35 +00:00
parent 273f94e9b6 63a7bb0b86
commit bd4a48c42c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mayan/apps/common/templatetags/common_tags.py
View File

@@ -83,9 +83,10 @@ def render_subtemplate(context, template_name, template_context):
Renders the specified template with the mixed parent and
subtemplate contexts
"""
new_context = Context(context.flatten())
new_context = Context(context)
new_context.update(Context(template_context))
return get_template(template_name).render(new_context.flatten())
return get_template(template_name).render(new_context)
@register.simple_tag