From 6006fc9b749681bf80205f6f0fc6cff3eb0558e1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 7 Sep 2017 05:09:54 +0000 Subject: [PATCH] Merge branch 'fix-context' into 'master' Fix error in context: it must be a dict See merge request !15 --- mayan/apps/common/templatetags/common_tags.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mayan/apps/common/templatetags/common_tags.py b/mayan/apps/common/templatetags/common_tags.py index c1a35a6177..b5cbbb249e 100644 --- a/mayan/apps/common/templatetags/common_tags.py +++ b/mayan/apps/common/templatetags/common_tags.py @@ -83,10 +83,9 @@ def render_subtemplate(context, template_name, template_context): Renders the specified template with the mixed parent and subtemplate contexts """ - - new_context = Context(context) + new_context = Context(context.flatten()) 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