From a41a188e7edf48cc077a254cfb82299ad6bb5b5a Mon Sep 17 00:00:00 2001
From: Petro Vashchuk <stalkernoid@gmail.com>
Date: Sun, 24 Jan 2021 21:42:10 +0200
Subject: [PATCH] Bug 27538: fix correlation of fields in Holds to Pull table

Bottom filtering row of "Holds to pull" table do not correlate to other
ones, columns diverged from "Call numbers" cell: it should be under
"Available call numbers" while it's under "Available barcodes", and so
on to the last cell (while number of cells still adjusted).

To reproduce:
   1) Head to the Holds to Pull page, check that bottom filtering row
      shifted to the left by one, starting from the "Call number"
      column and don't correlate to the upper table (for example, "Call
      numbers" cell should be under "Available call numbers" while it's
      under "Available barcodes"), and so on for all cells till the end
      of the filtering row.
   2) Apply patch.
   3) Refresh Holds to Pull page and ensure that all filtering row
      columns correlate to other rows columns correctly.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 65d09dc52097a6630d54ae45e3df1086b55a59ae)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit bc86c63c6b98d50908be039f9c45336d6b3471bf)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 .../prog/en/modules/circ/pendingreserves.tt       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 5546f46c4b..331748949d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -191,9 +191,10 @@
         <td><input type="text" class="filter" data-column_num="3" placeholder="Patron name" style="width:95%"/></td>
         <td><input type="text" class="filter" data-column_num="4" placeholder="Title" style="width:95%"/></td>
         <td id="homebranchfilter"></td>
-        <td><input type="text" class="filter" data-column_num="6" placeholder="Call number" style="width:95%"/></td>
-        <td><input type="text" class="filter" data-column_num="7" placeholder="Available copy" style="width:95%"/></td>
-        <td><input type="text" class="filter" data-column_num="8" placeholder="Available enumeration" style="width:95%"/></td>
+        <td></td>
+        <td><input type="text" class="filter" data-column_num="7" placeholder="Call number" style="width:95%"/></td>
+        <td><input type="text" class="filter" data-column_num="8" placeholder="Available copy" style="width:95%"/></td>
+        <td><input type="text" class="filter" data-column_num="9" placeholder="Available enumeration" style="width:95%"/></td>
         <td id="itemtype-filter"></td>
         <td id="locationfilter"></td>
         <td></td>
@@ -299,15 +300,15 @@
               });
           });
           $("#itemtype-filter").each( function () {
-              $(this).html( createSelect( holdst.fnGetColumnData(9) ) );
+              $(this).html( createSelect( holdst.fnGetColumnData(10) ) );
               $('select', this).change( function () {
-                  holdst.fnFilter( $(this).val(), 9 );
+                  holdst.fnFilter( $(this).val(), 10 );
               });
           });
           $("#locationfilter").each( function () {
-              $(this).html( createSelect( holdst.fnGetColumnData(10) ) );
+              $(this).html( createSelect( holdst.fnGetColumnData(11) ) );
               $('select', this).change( function () {
-                  holdst.fnFilter( $(this).val(), 10 );
+                  holdst.fnFilter( $(this).val(), 11 );
               });
           });
         });
-- 
2.39.5