From 29a82c1d19251f8f763a8b1d1ae9a6a6ee0afd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 4 Jul 2018 20:38:42 +0200 Subject: [PATCH] adapt to template changes (#25057) --- auquotidien/modules/template.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/auquotidien/modules/template.py b/auquotidien/modules/template.py index 5538c4a..b23a702 100644 --- a/auquotidien/modules/template.py +++ b/auquotidien/modules/template.py @@ -8,15 +8,26 @@ from wcs.qommon.admin.texts import TextsDirectory from wcs.categories import Category wcs_error_page = template.error_page +wcs_get_decorate_vars = template.get_decorate_vars -def render_response(publisher, body): - response = publisher.get_request().response - body = str(body) +def get_decorate_vars(body, response, generate_breadcrumb=True, template_context=None, **kwargs): + if template_context and 'form_side' in template_context: + # force rendering as it will put new variables in the context + template_context['form_side'] = template_context['form_side']() for key in ('bigdiv', 'gauche'): if not response.filter.has_key(key): response.filter[key] = None + return wcs_get_decorate_vars(body, response, generate_breadcrumb) + + +def render_response(publisher, body): + response = get_response() + + if isinstance(body, template.QommonTemplateResponse): + body = template.render(body.templates, body.context) + root_url = publisher.get_root_url() wcs_path = publisher.get_request().get_path()[len(root_url):] section = wcs_path.split('/')[0] @@ -77,6 +88,7 @@ def error_page(*args, **kwargs): return htmltext('

%s

' % title) + error_page + htmltext('
') template.error_page = error_page +template.get_decorate_vars = get_decorate_vars get_publisher_class().render_response = render_response TextsDirectory.register('aq-error-assistance', N_('Assistance text next to errors'))