From 63a7bb0b8617c2eace77d1082f3fd72198cd67dd Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 7 Sep 2017 05:12:21 +0000 Subject: [PATCH] Revert "Merge branch 'fix-context' into 'master'" This reverts merge request !15 --- mayan/apps/common/templatetags/common_tags.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mayan/apps/common/templatetags/common_tags.py b/mayan/apps/common/templatetags/common_tags.py index b5cbbb249e..c1a35a6177 100644 --- a/mayan/apps/common/templatetags/common_tags.py +++ b/mayan/apps/common/templatetags/common_tags.py @@ -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