From a72bf31d0bf155ef0bcdb09db1c8b89c0f61b8c5 Mon Sep 17 00:00:00 2001 From: Florent de Labarre Date: Sat, 7 Mar 2020 13:02:57 +0000 Subject: [PATCH] FIX] web: allow section and subsection in report In 10.0 having a `section`, `subsection` or `subsubsection` on a footer element would replace the content with the page top three level of headings. This was removed in 11.0 with b446930dc after which only `page` (current page number) and `pages` (total number of page) classes would work. This commit reintroduces the above-mentionned classes. opw-2226700 closes odoo/odoo#48888 X-original-commit: 14c6b947ecf222524a577ec6a40d4a6e283aa2ad Signed-off-by: Nicolas Lempereur (nle) Co-authored-by: Nicolas Lempereur --- addons/web/views/report_templates.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml index 4f6f6086c7a..973d1743832 100644 --- a/addons/web/views/report_templates.xml +++ b/addons/web/views/report_templates.xml @@ -92,14 +92,15 @@ var z = x[i].split('=', 2); vars[z[0]] = unescape(z[1]); } - var fromPage = document.getElementsByClassName('page'); - for(var j = 0; j<fromPage.length; j++) - fromPage[j].textContent = vars['sitepage']; - var toPage = document.getElementsByClassName('topage'); - for(var j = 0; j<toPage.length; j++) - toPage[j].textContent = vars['sitepages']; + var x = ['sitepage', 'sitepages', 'section', 'subsection', 'subsubsection']; + var z = {'sitepage': 'page', 'sitepages': 'topage'}; + for (var i in x) { + var y = document.getElementsByClassName(z[x[i]] || x[i]) + for (var j=0; j<y.length; ++j) + y[j].textContent = vars[x[i]]; + } - var index = vars['webpage'].split('.', 4)[3] + var index = vars['webpage'].split('.', 4)[3]; var header = document.getElementById('minimal_layout_report_headers'); if(header !== null){ var companyHeader = header.children[index];