From 14c2c8d6ff9e48666ba0b027a46e0a06b3c1faf9 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 10 Mar 2020 14:31:20 +0000 Subject: [PATCH] Bug 24131: (QA follow-up) Formatting in web client Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- installer/install.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 851accb319..2f740608c9 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -398,7 +398,7 @@ elsif ( $step && $step == 3 ) { close $fh; if (@report) { $template->param( update_report => - [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ] + [ map { local $_ = $_; $_ =~ s/\t/  /g; { line => $_ } } split( /\n/, join( '', @report ) ) ] ); $template->param( has_update_succeeds => 1 ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt index d6bcaedd76..bf8aa925f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% INCLUDE 'doc-head-open.inc' %] Koha › Web installer › @@ -249,7 +250,7 @@ <p>Update report :</p> <ul> [% FOREACH update_repor IN update_report %] - <li>[% update_repor.line | html %]</li> + <li>[% update_repor.line | $raw %]</li> [% END %] </ul> [% END %] -- 2.21.1 (Apple Git-122.3)