From 3e48b16f000ff5c61dda0dad382e64094d8007c0 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 23 Apr 2019 22:49:46 -0400
Subject: [PATCH] Bug 22621: Fix filters on subscription search results

Caused by
  commit 4e698f7b478a094d7b32ebfeaa917bca05ebcc5b
  Bug 18426: Allow to edit subscriptions in batch

There is a shift caused by a hidden column, which make the filters
searching on the previous column.

Test plan:
- Add 1+ searchable additional field for subscription
- Create a new subscription
- Search for subscriptions
- Use the column filters to filter the results
=> The results must be filtered accordingly

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1d6e9ff44c19379a41e9ce688685a24788583e0c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b61c41f0efebac66d561070d5a3e4533354d90d0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/modules/serials/serials-search.tt  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 1efdd62c5b..0c70a050ff 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
@@ -67,17 +67,19 @@
       <tfoot>
         <tr>
           <td></td>
-          <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
-          <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
-          <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search notes" /></td>
-          <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search library" /></td>
-          <td><input type="text" class="dt-filter" data-column_num="4" placeholder="Search location" /></td>
-          <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="1" placeholder="Search ISSN" /></td>
+          <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search title" /></td>
+          <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search notes" /></td>
+          <td><input type="text" class="dt-filter" data-column_num="4" placeholder="Search library" /></td>
+          <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search location" /></td>
+          <td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search callnumber" /></td>
+          [% SET column_num = 6 %]
           [% UNLESS closed %]
-              <td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>
+              <td><input type="text" class="dt-filter" data-column_num="7" placeholder="Search expiration date" /></td>
+              [% SET column_num = column_num + 1 %]
           [% END %]
           [% 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 + column_num | html %]" placeholder="Search [% field.name | html %]" /></td>
           [% END %]
           <td></td>
         </tr>
-- 
2.39.5