From d15af45055fd9c1c8df575f49a382ba7e4b48d0d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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 <br> 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 <victor.grousset@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../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 %]
         <td>
             [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
-                [% Branches.GetName ( holdingbranch ) %]<br>
+                [% Branches.GetName ( holdingbranch ) %]
             [% END %]
         </td>
         <td><p>[% reserveloo.itemcallnumber %]</p></td>
@@ -102,7 +102,7 @@
         </td>
         <td>
         [% FOREACH loc IN reserveloo.locations %]
-            [% AuthorisedValues.GetByCode('LOC', loc) %]<br>
+            [% AuthorisedValues.GetByCode('LOC', loc) %]
         [% END %]
         </td>
         <td>
@@ -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 <br> 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<cD.length ; j++ ) {
-                var split_array = cD[j].split(/<br>/gi);
+                var split_array = cD[j].split(/\n/gi);
                 for ( k=0 ; k<split_array.length ; k++ ){
                     var str = $.trim(split_array[k].replace(/[\n\r]/g, ''));
                     if ($.inArray(str, new_array) == -1 && str.length > 0 ) {
-- 
2.39.5