From db834b974bf457c719a1ab4e81ec482b5991132f Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 9 Aug 2018 21:28:30 +0000 Subject: [PATCH] Bug 20450: Add collection to item table when placing a hold on a specific copy (Intranet) This patch adds a new collection column to the item table when selecting a specific item for a hold. The column will only appear if at least one item has a collection set. To test, in staff: - Place a specific hold on - a record with one or more items with collections - a record with one or more items without collections - Verify the collections display correctly when they exist - Verify the table still works as expected --- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 9 +++++++++ reserve/request.pl | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 2b435d2..6b8b385 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -4,6 +4,7 @@ [% USE Branches %] [% USE Categories %] [% USE ItemTypes %] +[% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% UNLESS ( multi_hold ) %] @@ -291,6 +292,9 @@ Barcode Home library Last location + [% IF itemdata_ccode %] + Collection + [% END %] Call no. Copy number [% IF itemdata_enumchron %] @@ -358,6 +362,11 @@ [% Branches.GetName( itemloo.holdingbranch ) %] + [% IF itemdata_ccode %] + + [% IF ( itemloo.ccode ) %][% AuthorisedValues.GetByCode( 'CCODE', itemloo.ccode ) %][% END %] + + [% END %] [% itemloo.itemcallnumber %] diff --git a/reserve/request.pl b/reserve/request.pl index 2902de0..7f3b422 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -199,6 +199,7 @@ my $patron = Koha::Patrons->find( $borrowernumber_hold ); my $logged_in_patron = Koha::Patrons->find( $borrowernumber ); my $itemdata_enumchron = 0; +my $itemdata_ccode = 0; my @biblioloop = (); foreach my $biblionumber (@biblionumbers) { next unless $biblionumber =~ m|^\d+$|; @@ -492,6 +493,10 @@ foreach my $biblionumber (@biblionumbers) { if ($item->{enumchron}) { $itemdata_enumchron = 1; } + # Show collection when needed + if ($item->{ccode}) { + $itemdata_ccode = 1; + } } push @{ $biblioitem->{itemloop} }, $item; @@ -602,6 +607,7 @@ foreach my $biblionumber (@biblionumbers) { optionloop => \@optionloop, bibitemloop => \@bibitemloop, itemdata_enumchron => $itemdata_enumchron, + itemdata_ccode => $itemdata_ccode, date => $date, biblionumber => $biblionumber, findborrower => $findborrower, -- 2.1.4