From d15af45055fd9c1c8df575f49a382ba7e4b48d0d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 24 Apr 2018 15:21:36 -0300 Subject: [PATCH] Bug 20637: Fix filters content on the holds to pull screen libraries and locations are separated by
whereas itypes are using \n This patch standardized the separator to generate correctly the filters pulldown Test plan: - Place a hold on a biblio record which has several items - Define different locations and itypes for these items - Display the holds on the "Holds to pull" screen and make sure the filters are working correctly (focus on the dropdown list) Signed-off-by: Victor Grousset Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 5072c8d1f2..fc629e735c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -89,7 +89,7 @@ [% END %] [% FOREACH holdingbranch IN reserveloo.holdingbranches %] - [% Branches.GetName ( holdingbranch ) %]
+ [% Branches.GetName ( holdingbranch ) %] [% END %]

[% reserveloo.itemcallnumber %]

@@ -102,7 +102,7 @@ [% FOREACH loc IN reserveloo.locations %] - [% AuthorisedValues.GetByCode('LOC', loc) %]
+ [% AuthorisedValues.GetByCode('LOC', loc) %] [% END %] @@ -208,7 +208,7 @@ "aoColumnDefs": [ { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, { "sType": "title-string", "aTargets" : [ "title-string" ] }, - { "sType": "string", "aTargets": [ "string-sort" ] } //Target columns that use
separators and pull-down menus. + { "sType": "string", "aTargets": [ "string-sort" ] } ], "sPaginationType": "full_numbers" }, columns_settings); @@ -218,7 +218,7 @@ var cD = ColumnData; var new_array = new Array(); for ( j=0 ; j/gi); + var split_array = cD[j].split(/\n/gi); for ( k=0 ; k 0 ) { -- 2.39.5