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

Merge branch 'fix-context' into 'master'

Browse Source 
Fix error in context: it must be a dict

See merge request !15
This commit is contained in:
Roberto Rosario
2017-09-07 05:09:54 +00:00
parent 7a30537d22 13bb415187
commit 273f94e9b6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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