Attachment 100535 Details for Bug 24131 – Bug 24131: (QA follow-up) Formatting in web client

[patch] Bug 24131: (QA follow-up) Formatting in web client

Bug-24131-QA-follow-up-Formatting-in-web-client.patch (text/plain), 1.87 KB, created by Jonathan Druart on 2020-03-11 11:05:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-03-11 11:05:43 UTC

Size: 1.87 KB

patch

obsolete

>From baf116b51890b0be993580fc34c593821825f8a6 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>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 <jonathan.druart@bugs.koha-community.org>
>---
> 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/&emsp;&emsp;/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 9f37a5abc1..9fe689ae62 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' %]
> 
> <title>Koha &rsaquo; Web installer &rsaquo;
>@@ -243,7 +244,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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 24131: 98536 | 98537 | 99315 | 99316 | 99317 | 99521 | 99522 | 99523 | 99524 | 100161 | 100162 | 100163 | 100164 | 100464 | 100465 | 100466 | 100467 | 100468 | 100530 | 100531 | 100532 | 100533 | 100534 | 100535 | 100536 | 100538 | 101155 | 101159 | 101160 | 101162 | 101164 | 101166 | 101168 | 101187 | 103001