From 0713fec17761618986f23ae20ffe83475077d4d3 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Thu, 11 Apr 2024 10:40:16 +0000
Subject: [PATCH] Bug 36563: Turn into array only if required

Test plan, apply first patch:
1- Visit item search:
   http://localhost:8081/cgi-bin/koha/catalogue/itemsearch.pl
2- Set "Home library" -> "is not" -> "Centerville". Notice you get items
   from Centerville.
3- Apply second patch, repeat step 2, notice you now don't get items
   from Centervile.
4- Test other use cases, like 'is' and 'is not' for multiple choices

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit eae74ed6d9935ee7247ccd85f9a1d502755ca338)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 0513ffa58e512d149a44a9d4bd4750d182816e48)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 catalogue/itemsearch.pl                           | 15 +++++++++++----
 .../prog/en/modules/catalogue/itemsearch.tt       |  7 ++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
index 6f59ae9baa..7f58423602 100755
--- a/catalogue/itemsearch.pl
+++ b/catalogue/itemsearch.pl
@@ -119,14 +119,21 @@ if ( defined $format ) {
         filters => [],
     };
 
-    foreach my $p (qw(homebranch holdingbranch location itype ccode issues datelastborrowed notforloan itemlost withdrawn)) {
-        if (my @q = $cgi->multi_param($p)) {
-            if ($q[0] ne '') {
+    foreach
+        my $p (qw(homebranch holdingbranch location itype ccode issues datelastborrowed notforloan itemlost withdrawn))
+    {
+        my @q;
+        @q = $cgi->multi_param( $p . "[]" );
+        if ( scalar @q == 0 ) {
+            @q = $cgi->multi_param($p);
+        }
+        if (@q) {
+            if ( $q[0] ne '' ) {
                 my $f = {
                     field => $p,
                     query => \@q,
                 };
-                if (my $op = scalar $cgi->param($p . '_op')) {
+                if ( my $op = scalar $cgi->param( $p . '_op' ) ) {
                     $f->{operator} = $op;
                 }
                 push @{ $filter->{filters} }, $f;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index 89006963d5..862fbf5a72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -461,10 +461,11 @@
                     type: 'POST',
                     data: function ( d ) {
                         for (i in params) {
-                            if (! d.hasOwnProperty(params[i].name) ) {
-                                d[params[i].name] = [];
+                            if(d[params[i].name]){
+                                d[params[i].name] = [].concat(d[params[i].name], params[i].value);
+                            }else{
+                                d[params[i].name] = params[i].value;
                             }
-                            d[params[i].name].push(params[i].value);
                         }
                         d.format = 'json';
                         d.columns = JSON.stringify( d.columns );
-- 
2.39.5