Attachment 124096 Details for Bug 19368 – Bug 19368 - (QA follow-up) Correction on QA feedback

[patch] Bug 19368 - (QA follow-up) Correction on QA feedback

Bug-19368---QA-follow-up-Correction-on-QA-feedback.patch (text/plain), 12.04 KB, created by Alexis Ripetti on 2021-08-25 20:45:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexis Ripetti

Created: 2021-08-25 20:45:06 UTC

Size: 12.04 KB

patch

obsolete

>From 17b76945b66766699dc6502de3d1c29be73e2cc8 Mon Sep 17 00:00:00 2001
>From: alexis <alexis@inlibro.com>
>Date: Wed, 25 Aug 2021 11:18:55 -0400
>Subject: [PATCH] Bug 19368 - (QA follow-up) Correction on QA feedback
>
>---
> .../prog/en/includes/datatables.inc           |  4 +-
> .../prog/en/modules/serials/serials-search.tt | 52 +++++++++----------
> .../bootstrap/en/includes/datatables.inc      |  4 +-
> 3 files changed, 29 insertions(+), 31 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>index f1b8dcc0f3..031dceba63 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc
>@@ -8,7 +8,7 @@
> [% Asset.js("lib/jquery/plugins/jszip.min.js") | $raw %]
> [% Asset.js("lib/jquery/plugins/buttons.print.min.js") | $raw %]
> [% Asset.js("lib/jquery/plugins/buttons.html5.min.js") | $raw %]
>-<script type="text/javascript">
>+<script>
> //<![CDATA[
>     var MSG_DT_FIRST = _("First");
>     var MSG_DT_LAST = _("Last");
>@@ -24,7 +24,7 @@
>     var MSG_DT_SEARCH = _("Search:");
>     var MSG_DT_ZERO_RECORDS = _("No matching records found");
>     var MSG_DT_ALL = _("All");
>-    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
>+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') | html %]";
>     var MSG_DT_COPY_TITLE = _("Copy to clipboard");
>     var MSG_DT_COPY_KEYS = _("Press ctrl or â + C to copy the table data<br>to your system clipboard.<br><br>To cancel, click this message or press escape.");
>     var MSG_DT_COPY_SUCCESS_ONE = _("Copied one row to clipboard");
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>index 3254f38520..7b6df753ba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
>@@ -317,9 +317,9 @@
>                         <th>Library</th>
>                         <th>Location</th>
>                         <th>Call number</th>
>-                        <th class="title-string">Expiration date</th>
>+                        <th>Expiration date</th>
>                         [% FOR field IN additional_fields_for_subscription %]
>-                          <th>[% field.name %]</th>
>+                          <th>[% field.name | html %]</th>
>                         [% END %]
>                         <th class="NoSort">Actions</th>
>                     </tr>
>@@ -334,7 +334,7 @@
>                       <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>
>                       <td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>
>                       [% FOR field IN additional_fields_for_subscription %]
>-                        <td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name %]" /></td>
>+                        <td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 | html %]" placeholder="Search [% field.name | html %]" /></td>
>                       [% END %]
>                       <td colspan="2"></td>
>                     </tr>
>@@ -343,38 +343,36 @@
>                     [% FOREACH subscription IN openedsubscriptions %]
>                     [% UNLESS subscription.cannotdisplay %]
>                       <tr>
>-                        <td>[% IF ( subscription.titlesort ) %][% subscription.titlesort %][% END %]</td>
>+                        <td>[% IF ( subscription.titlesort ) %][% subscription.titlesort | html %][% END %]</td>
>                         <td>
>-                        [% IF ( subscription.issn ) %][% subscription.issn %]
>+                        [% IF ( subscription.issn ) %][% subscription.issn | html %]
>                         [% END %]
>                         </td>
>-                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
>+                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" class="button" title="subscription detail">[% subscription.title | html %]</a>
>                         </td>
>-                        <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes %][% END %]
>-                        [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
>+                        <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
>+                        [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]
>                         </td>
>                         <td>
>-                          [% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) %][% END %]
>+                          [% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) | html %][% END %]
>                         </td>
>                         <td>
>-                          [% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) %][% END %]
>+                          [% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) | html %][% END %]
>                         </td>
>                         <td>
>-                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
>-                        </td>
>-                        <td>
>-                            [% IF ( subscription.enddate ) %]
>-                                <span title="[% subscription.enddate %]">[% subscription.enddate | $KohaDates %]</span>
>-                            [% ELSE %]
>-                                <span title="0000-00-00"></span>
>-                            [% END %]
>+                          [% IF ( subscription.callnumber ) %][% subscription.callnumber | html %][% END %]
>                         </td>
>+                        [% IF ( subscription.enddate ) %]
>+                            <td data-order="[% subscription.enddate | html %]">[% subscription.enddate | $KohaDates %]</td>
>+                        [% ELSE %]
>+                            <td data-order="0000-00-00"></td>
>+                        [% END %]
> 
>                         [% FOR field IN additional_fields_for_subscription %]
>                           [% IF field.authorised_value_category %]
>-                            <td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
>+                            <td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) | html %]</td>
>                           [% ELSE %]
>-                            <td>[% subscription.additional_fields.${field.name} %]</td>
>+                            <td>[% subscription.additional_fields.${field.name} | html %]</td>
>                           [% END %]
>                         [% END %]
> 
>@@ -384,32 +382,32 @@
>                                     [% IF ( CAN_user_serials_receive_serials ) %]
>                                         [%# There should be no space between these two buttons, it would render badly %]
>                                         <a class="btn btn-default btn-xs" role="button"
>-                                           href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7"><i
>+                                           href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;serstatus=1,3,7"><i
>                                            class="fa fa-inbox"></i> Serial receive</a><a
>-                                           class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button"
>+                                           class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid | html %]" role="button"
>                                            data-toggle="dropdown" href="#"><b class="caret"></b></a>
>                                     [% ELSE %]
>-                                        <a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
>+                                        <a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid | html %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
>                                     [% END %]
>-                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid %]">
>+                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid | html %]">
> 
>                                     [% IF ( routing && CAN_user_serials_routing ) %]
>                                         [% IF ( subscription.cannotedit ) %]
>                                         [% ELSE %]
>                                             [% IF ( subscription.routingedit ) %]
>                                                 <li>
>-                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit %])</a>
>+                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingediti | html %])</a>
>                                                 </li>
>                                             [% ELSE %]
>                                                 <li>
>-                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new"> <i class="fa fa-plus"></i> New routing list</a>
>+                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=new"> <i class="fa fa-plus"></i> New routing list</a>
>                                                 </li>
>                                             [% END %]
>                                         [% END %]
>                                     [% END # IF ( routing && CAN_user_serials_routing ) %]
> 
>                                     <li>
>-                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-list-alt"></i> Issue history</a>
>+                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
>                                     </li>
>                                 </ul>
>                                 </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>index 09c22e5f1d..aba247ea34 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc
>@@ -21,7 +21,7 @@
>     var MSG_DT_COPIED_ONE_ROW = _("Copied one row to clipboard");
>     var MSG_CLEAR_FILTER = _("Clear filter");
>     var MSG_DT_ALL = _("All");
>-    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
>+    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') | html %]";
> //]]>
> </script>
>-[% Asset.js("js/datatables.js") %]
>+[% Asset.js("js/datatables.js") | $raw %]
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 19368: 67373 | 67447 | 67580 | 67581 | 67612 | 69005 | 70051 | 70052 | 70053 | 70125 | 71962 | 71963 | 71964 | 71965 | 72043 | 72044 | 72045 | 72046 | 72047 | 72655 | 72656 | 72657 | 72658 | 72659 | 74262 | 74263 | 74264 | 74265 | 74266 | 90915 | 90916 | 90918 | 90919 | 90920 | 90921 | 113018 | 113019 | 113020 | 113021 | 113022 | 113023 | 113344 | 113345 | 113346 | 113347 | 113348 | 113349 | 118963 | 118964 | 118965 | 118966 | 118967 | 118968 | 124090 | 124091 | 124092 | 124093 | 124094 | 124095 | 124096 | 124097 | 124104 | 124105 | 124106 | 124107 | 124108 | 124109 | 124110 | 124111