Bugzilla – Attachment 47528 Details for
Bug 15717
Installer: Step 3 has HTML tag br showing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15717: Installer: Step 3 has <br /> showing
Bug-15717-Installer-Step-3-has-br--showing.patch (text/plain), 3.96 KB, created by
Mark Tompsett
on 2016-02-01 19:30:05 UTC
(
hide
)
Description:
Bug 15717: Installer: Step 3 has <br /> showing
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2016-02-01 19:30:05 UTC
Size:
3.96 KB
patch
obsolete
>From 75eee9e9079dc73b0297fae94f84b533e2b65f16 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Mon, 1 Feb 2016 14:25:56 -0500 >Subject: [PATCH] Bug 15717: Installer: Step 3 has <br /> showing > >The step to install optional/mandatory things is broken with >many <br />'s instead of line breaks. > >TEST PLAN >--------- >1) Back up database >2) Drop database >3) Create empty database >4) Run web installer > -- Notice that step 3 has ugly <br />'s at the last > part of step 3. >5) Apply patch >6) Repeat steps 2-4 > -- Notice the <br />'s are now nice line breaks. > NOTE: No promises of perfect positioning! >7) Run koha qa test tools. >--- > C4/Installer.pm | 16 ++++++++-------- > .../intranet-tmpl/prog/en/modules/installer/step3.tt | 8 ++++++-- > 2 files changed, 14 insertions(+), 10 deletions(-) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index 5fe2e16..0db8cca 100644 >--- a/C4/Installer.pm >+++ b/C4/Installer.pm >@@ -137,15 +137,15 @@ sub marc_framework_sql_list { > map { > my $name = substr( $_, 0, -4 ); > open my $fh, "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt"; >- my $lines = <$fh>; >- $lines =~ s/\n|\r/<br \/>/g; >- $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) ); >+ my $line = <$fh>; >+ $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) ); >+ my @lines = split /\n/, $line; > my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i); > push @frameworklist, > { > 'fwkname' => $name, > 'fwkfile' => "$dir/$requirelevel/$_", >- 'fwkdescription' => $lines, >+ 'fwkdescription' => \@lines, > 'checked' => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ), > 'mandatory' => $mandatory, > }; >@@ -214,15 +214,15 @@ sub sample_data_sql_list { > map { > my $name = substr( $_, 0, -4 ); > open my $fh , "<:encoding(UTF-8)", "$dir/$requirelevel/$name.txt"; >- my $lines = <$fh>; >- $lines =~ s/\n|\r/<br \/>/g; >- $lines = Encode::encode('UTF-8', $lines) unless ( Encode::is_utf8($lines) ); >+ my $line = <$fh>; >+ $line = Encode::encode('UTF-8', $line) unless ( Encode::is_utf8($line) ); >+ my @lines = split /\n/, $line; > my $mandatory = ($requirelevel =~ /(mandatory|requi|oblig|necess)/i); > push @frameworklist, > { > 'fwkname' => $name, > 'fwkfile' => "$dir/$requirelevel/$_", >- 'fwkdescription' => $lines, >+ 'fwkdescription' => \@lines, > 'checked' => ( ( $frameworksloaded{$_} || $mandatory ) ? 1 : 0 ), > 'mandatory' => $mandatory, > }; >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 6bcd69e..2a594a3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -117,7 +117,9 @@ > </td> > <td> > <label for="[% framework.fwkname %]"> >- [% framework.fwkdescription %] >+ [% FOREACH description IN framework.fwkdescription %] >+ [% description %]<br /> >+ [% END %] > <em>([% framework.fwkname %])</em> > </label> > </td> >@@ -146,7 +148,9 @@ > </td> > <td> > <label for="[% framework.fwkname %]"> >- [% framework.fwkdescription %] >+ [% FOREACH description IN framework.fwkdescription %] >+ [% description %]<br /> >+ [% END %] > <em>([% framework.fwkname %])</em> > </label> > </td> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15717
:
47528
|
47529
|
47536