Attachment 86196 Details for Bug 22466 – Bug 22466: Replace existing occurrences

[patch] Bug 22466: Replace existing occurrences

Bug-22466-Replace-existing-occurrences.patch (text/plain), 6.60 KB, created by Tomás Cohen Arazi (tcohen) on 2019-03-06 16:00:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2019-03-06 16:00:28 UTC

Size: 6.60 KB

patch

obsolete

>From 437f25e7348a1e71e2f2e8462027587d88ba0f06 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 6 Mar 2019 11:59:58 -0300
>Subject: [PATCH] Bug 22466: Replace existing occurrences
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../prog/en/modules/reserve/request.tt           | 16 ++++++++--------
> .../prog/en/modules/serials/serials-search.tt    |  2 +-
> .../bootstrap/en/modules/opac-reserve.tt         |  2 +-
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index d4956573ce..8a0cc00eba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -542,7 +542,7 @@
>                             [% SET branchcodes = [] %]
> 
>                             [% FOREACH h IN biblioloo.reserveloop %]
>-                                [% branchcodes.push( h.branchcode ) | $raw %]
>+                                [% branchcodes.push( h.branchcode ) %]
>                             [% END %]
>                             [% branchcodes = branchcodes.unique %]
> 
>@@ -550,7 +550,7 @@
>                                 [% SET holds_by_branch = [] %]
>                                 [% FOREACH h IN biblioloo.reserveloop %]
>                                     [% IF h.branchcode == b %]
>-                                        [% holds_by_branch.push( h ) | $raw %]
>+                                        [% holds_by_branch.push( h ) %]
>                                     [% END %]
>                                 [% END %]
>                                 <fieldset>
>@@ -563,7 +563,7 @@
> 
>                             [% FOREACH h IN biblioloo.reserveloop %]
>                                 [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
>-                                [% itemtypes.push( hold_itemtype ) | $raw %]
>+                                [% itemtypes.push( hold_itemtype ) %]
>                             [% END %]
>                             [% itemtypes = itemtypes.unique %]
> 
>@@ -572,7 +572,7 @@
>                                 [% FOREACH h IN biblioloo.reserveloop %]
>                                     [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
>                                     [% IF hold_itemtype == i %]
>-                                        [% holds_by_itemtype.push( h ) | $raw %]
>+                                        [% holds_by_itemtype.push( h ) %]
>                                     [% END %]
>                                 [% END %]
> 
>@@ -589,7 +589,7 @@
>                             [% SET branchcodes = [] %]
> 
>                             [% FOREACH h IN biblioloo.reserveloop %]
>-                                [% branchcodes.push( h.branchcode ) | $raw %]
>+                                [% branchcodes.push( h.branchcode ) %]
>                             [% END %]
>                             [% branchcodes = branchcodes.unique %]
> 
>@@ -599,14 +599,14 @@
>                                     [% SET holds_by_branch = [] %]
>                                     [% FOREACH h IN biblioloo.reserveloop %]
>                                         [% IF h.branchcode == b %]
>-                                            [% holds_by_branch.push( h ) | $raw %]
>+                                            [% holds_by_branch.push( h ) %]
>                                         [% END %]
>                                     [% END %]
> 
>                                     [% SET itemtypes = [] %]
>                                     [% FOREACH h IN holds_by_branch %]
>                                         [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
>-                                        [% itemtypes.push( hold_itemtype ) | $raw %]
>+                                        [% itemtypes.push( hold_itemtype ) %]
>                                     [% END %]
>                                     [% itemtypes = itemtypes.unique %]
> 
>@@ -622,7 +622,7 @@
>                                             [% FOREACH h IN holds_by_branch %]
>                                                 [% SET hold_itemtype = h.object.item.effective_itemtype || h.itemtype %]
>                                                 [% IF hold_itemtype == i %]
>-                                                    [% holds_by_itemtype.push( h ) | $raw %]
>+                                                    [% holds_by_itemtype.push( h ) %]
>                                                 [% END %]
>                                             [% END %]
>                                             [% INCLUDE holds_table.inc holds=holds_by_itemtype %]
>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 e3ce4f5b4a..ffdcc14ac3 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
>@@ -21,7 +21,7 @@
> [% url_params = [] %]
> [% FOREACH param IN CGI.params.pairs %]
>     [% escaped_value = BLOCK %][% param.value | uri %][% END %]
>-    [% url_params.push(param.key _ '=' _ escaped_value) | html %]
>+    [% url_params.push(param.key _ '=' _ escaped_value) %]
> [% END %]
> [% SET referrer = '/cgi-bin/koha/serials/serials-search.pl?' %]
> [% referrer = BLOCK %][% referrer | url %][% url_params.join("&amp;") |uri %][% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>index 7206c8e348..75d206f231 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
>@@ -279,7 +279,7 @@
>                                                         [% IF Koha.Preference('AllowHoldItemTypeSelection') %]
>                                                             [% itemtypes = [] %]
>                                                             [% FOREACH item IN bibitemloo.itemLoop %]
>-                                                                [% itemtypes.push( item.itype ) | html %]
>+                                                                [% itemtypes.push( item.itype ) %]
>                                                             [%- END %]
>                                                             <li>
>                                                                 <label for="itemtype">Request specific item type:</label>
>-- 
>2.21.0

Actions: View | Diff | Splinter Review

Attachments on bug 22466: 86185 | 86186 | 86187 | 86191 | 86192 | 86193 | 86194 | 86195 | 86196