From e0d1036506a37f43f0d2ccd6c5b329de3ee43e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 10 Apr 2017 10:51:01 +0200 Subject: [PATCH] override publisher.render_response instead of template.decorate (#15806) --- extra/modules/template.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extra/modules/template.py b/extra/modules/template.py index af8e067..dfd4b2c 100644 --- a/extra/modules/template.py +++ b/extra/modules/template.py @@ -1,4 +1,5 @@ from quixote import get_request, get_publisher, get_response +from qommon.publisher import get_publisher_class from quixote.html import htmltext from qommon import _ @@ -6,18 +7,18 @@ from qommon import template from qommon.admin.texts import TextsDirectory from wcs.categories import Category -wcs_decorate = template.decorate wcs_error_page = template.error_page -def decorate(body, response): +def render_response(publisher, body): + response = publisher.get_request().response body = str(body) for key in ('bigdiv', 'gauche'): if not response.filter.has_key(key): response.filter[key] = None - root_url = get_publisher().get_root_url() - wcs_path = get_request().get_path()[len(root_url):] + root_url = publisher.get_root_url() + wcs_path = publisher.get_request().get_path()[len(root_url):] section = wcs_path.split('/')[0] if section in ('backoffice', 'admin'): @@ -61,7 +62,7 @@ def decorate(body, response): if len(response.breadcrumb) == 1: response.breadcrumb = None - return wcs_decorate(body, response) + return template.decorate(body, response) def error_page(*args, **kwargs): @@ -75,8 +76,7 @@ def error_page(*args, **kwargs): get_response().filter['title'] = None return htmltext('

%s

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