Bugzilla – Attachment 102294 Details for
Bug 23173
ILL should be able to search third party sources prior to request creation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23173: (follow-up) Fix QA script errors
Bug-23173-follow-up-Fix-QA-script-errors.patch (text/plain), 8.05 KB, created by
Kyle M Hall (khall)
on 2020-04-02 12:14:51 UTC
(
hide
)
Description:
Bug 23173: (follow-up) Fix QA script errors
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2020-04-02 12:14:51 UTC
Size:
8.05 KB
patch
obsolete
>From dba1210685398a41e165281335da6f54b81e8312 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 1 Apr 2020 15:13:06 -0400 >Subject: [PATCH] Bug 23173: (follow-up) Fix QA script errors > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/Illrequest/Availability.pm | 20 +++++++++---------- > .../en/includes/ill-availability-table.inc | 6 +++--- > .../prog/en/modules/ill/ill-requests.tt | 8 ++++---- > .../en/includes/ill-availability-table.inc | 8 ++++---- > .../bootstrap/en/modules/opac-illrequests.tt | 6 +++--- > 5 files changed, 24 insertions(+), 24 deletions(-) > >diff --git a/Koha/Illrequest/Availability.pm b/Koha/Illrequest/Availability.pm >index a9ca6efd4d..9013c1749a 100644 >--- a/Koha/Illrequest/Availability.pm >+++ b/Koha/Illrequest/Availability.pm >@@ -4,18 +4,18 @@ package Koha::Illrequest::Availability; > # > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 3 of the License, or (at your option) any later >-# version. >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc >index 69e6679edc..e609b6b287 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-availability-table.inc >@@ -1,6 +1,6 @@ > <div> >- <table class="ill-availability" id="[% service.id %]"> >- <thead id="[% service.id %]-header"> >+ <table class="ill-availability" id="[% service.id | html %]"> >+ <thead id="[% service.id | html %]-header"> > <tr> > <th>Source</th> > <th>Title</th> >@@ -10,7 +10,7 @@ > <th>Date</th> > </tr> > </thead> >- <tbody id="[% service.id %]-body"> >+ <tbody id="[% service.id | html %]-body"> > </tbody> > </table> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 39768608b5..deebddf5c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -332,7 +332,7 @@ > </div> > <div class="modal-body"> > [% FOR service IN services %] >- <h4 class="ill_availability_sourcename">[% service.name %]</h4> >+ <h4 class="ill_availability_sourcename">[% service.name | html %]</h4> > [% INCLUDE 'ill-availability-table.inc' service=service %] > [% END %] > <span id="service_id_restrict" data-service_id_restrict_plugin="ILL availability - z39.50" data-service_id_restrict_ids=""></span> >@@ -733,8 +733,8 @@ > [% custom_values = whole.custom_value.split('\0') %] > [% i = 0 %] > [% FOREACH custom_key IN custom_keys %] >- <input type="hidden" name="custom_key" value="[% custom_key %]"> >- <input type="hidden" name="custom_value" value="[% custom_values.$i %]"> >+ <input type="hidden" name="custom_key" value="[% custom_key | html %]"> >+ <input type="hidden" name="custom_value" value="[% custom_values.$i | html %]"> > [% i = i + 1 %] > [% END %] > <input type="hidden" name="method" value="create"> >@@ -747,7 +747,7 @@ > </div> > </form> > [% FOR service IN services %] >- <h4 class="ill_availability_sourcename">[% service.name %]</h4> >+ <h4 class="ill_availability_sourcename">[% service.name | html %]</h4> > [% INCLUDE 'ill-availability-table.inc' service=service %] > [% END %] > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc >index a2597bc3cf..bd99743147 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill-availability-table.inc >@@ -1,7 +1,7 @@ > <div> >- <div>[% service.name %]</div> >- <table class="ill-availability table table-bordered table-striped" id="[% service.id %]"> >- <thead id="[% service.id %]-header"> >+ <div>[% service.name | html %]</div> >+ <table class="ill-availability table table-bordered table-striped" id="[% service.id | html %]"> >+ <thead id="[% service.id | html %]-header"> > <tr> > <th>Source</th> > <th>Title</th> >@@ -11,7 +11,7 @@ > <th>Date</th> > </tr> > </thead> >- <tbody id="[% service.id %]-body"> >+ <tbody id="[% service.id | html %]-body"> > </tbody> > </table> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >index 77fa2aaa22..b9611a1603 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -239,8 +239,8 @@ > [% custom_values = whole.custom_value.split('\0') %] > [% i = 0 %] > [% FOREACH custom_key IN custom_keys %] >- <input type="hidden" name="custom_key" value="[% custom_key %]"> >- <input type="hidden" name="custom_value" value="[% custom_values.$i %]"> >+ <input type="hidden" name="custom_key" value="[% custom_key | html %]"> >+ <input type="hidden" name="custom_value" value="[% custom_values.$i | html %]"> > [% i = i + 1 %] > [% END %] > <input type="hidden" name="checked_availability" value="1"> >@@ -251,7 +251,7 @@ > </div> > </form> > [% FOR service IN services %] >- <h4 class="ill_availability_sourcename">[% service.name %]</h4> >+ <h4 class="ill_availability_sourcename">[% service.name | html %]</h4> > [% INCLUDE 'ill-availability-table.inc' service=service %] > [% END %] > </div> >-- >2.24.1 (Apple Git-126)
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 23173
:
91464
|
91465
|
92107
|
92108
|
92539
|
92540
|
92550
|
92551
|
92640
|
92641
|
92693
|
92694
|
92695
|
92715
|
92716
|
92717
|
93146
|
93147
|
93148
|
93909
|
93910
|
93911
|
95268
|
95269
|
95270
|
98521
|
99083
|
100724
|
100725
|
100740
|
102179
|
102180
|
102181
|
102182
|
102183
|
102184
|
102286
|
102287
|
102288
|
102289
|
102290
|
102291
|
102292
|
102293
| 102294