From 2324b0a4aefc93e5eda04bf015dc2a42f61f8126 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 8 Feb 2021 16:07:03 +0100 Subject: [PATCH] Bug 4037: Correctly join the itemtypes array --- C4/Items.pm | 13 +++++-------- .../prog/en/modules/tools/inventory.tt | 4 ---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index e5b478316c..48aed7b195 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -489,7 +489,7 @@ lists of authorized values for certain item fields. offset => $offset, size => $size, statushash => $statushash, - itemtypes => @itemsarray, + itemtypes => \@itemsarray, } ); Retrieve a list of title/authors/barcode/callnumber, for biblio inventory. @@ -522,7 +522,7 @@ sub GetItemsForInventory { my $size = $parameters->{'size'} // ''; my $statushash = $parameters->{'statushash'} // ''; my $ignore_waiting_holds = $parameters->{'ignore_waiting_holds'} // ''; - my $items = $parameters->{'itemtypes'} // ''; + my $itemtypes = $parameters->{'itemtypes'} || []; my $dbh = C4::Context->dbh; my ( @bind_params, @where_strings ); @@ -592,12 +592,9 @@ sub GetItemsForInventory { push( @where_strings, q{(reserves.found != 'W' OR reserves.found IS NULL)} ); } - if ( $items and @{$items} > 0 ){ - my $joinedvals; - for my $itemtype (@{$items}){ - $joinedvals = join(',', @{$items}); - } - push @where_strings, "( biblioitems.itemtype IN (" . $joinedvals . ") OR items.itype IN (" . $joinedvals . ") )"; + if ( @$itemtypes ) { + my $itemtypes_str = join ', ', @$itemtypes; + push @where_strings, "( biblioitems.itemtype IN (" . $itemtypes_str . ") OR items.itype IN (" . $itemtypes_str . ") )"; } if ( @where_strings ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt index 4faa432eda..d7c2343cb8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt @@ -167,10 +167,6 @@ - [% IF loop.count() % 4 == 0 && !loop.last() %] - -
- [% END %] [% END %]
-- 2.20.1