From f6ff867efdbd02a8dedccc7ef48851a3f5b6ca3b Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Fri, 21 Sep 2018 10:43:23 +0000 Subject: [PATCH] Bug 15516: (follow-up) Fix reserve -> hold change Signed-off-by: Josef Moravec --- circ/pendingreserves.pl | 4 ++-- reserve/hold-group.pl | 2 +- reserve/placerequest.pl | 2 +- reserve/request.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 1e650fb..3b18912 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -192,7 +192,7 @@ my $strsth = ORDER BY items.itemnumber SEPARATOR '
') l_enumchron, GROUP_CONCAT(DISTINCT items.copynumber ORDER BY items.itemnumber SEPARATOR '
') l_copynumber, - reserves.reserve_group_id, + reserves.hold_group_id, biblio.title, biblio.author, count(DISTINCT items.itemnumber) as icount, @@ -259,7 +259,7 @@ while ( my $data = $sth->fetchrow_hashref ) { holdingbranch => $data->{holdingbranch}, homebranch => $data->{homebranch}, itemnumber => $data->{itemnumber}, - reserve_group_id => $data->{reserve_group_id}, + hold_group_id => $data->{hold_group_id}, } ); } diff --git a/reserve/hold-group.pl b/reserve/hold-group.pl index fbffa13..49d33e4 100755 --- a/reserve/hold-group.pl +++ b/reserve/hold-group.pl @@ -32,7 +32,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({ }); my $hold_group_id = $cgi->param('hold_group_id'); -my @reserves = GetHoldGroupHolds($hold_group_id); +my @holds = GetHoldGroupHolds($hold_group_id); $template->param( hold_group_id => $hold_group_id, diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl index d2e31ce..218b4a0 100755 --- a/reserve/placerequest.pl +++ b/reserve/placerequest.pl @@ -75,7 +75,7 @@ if ( $type eq 'str8' && $borrower ) { my $hold_group_id; if ($multi_hold && $requestany) { - $hold_group_id = AddReserveGroup(); + $hold_group_id = AddHoldGroup(); } foreach my $biblionumber ( keys %bibinfos ) { diff --git a/reserve/request.pl b/reserve/request.pl index 15da32f..053f097 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -591,7 +591,7 @@ foreach my $biblionumber (@biblionumbers) { $reserve{itemtype} = $res->itemtype(); $reserve{branchcode} = $res->branchcode(); $reserve{object} = $res; - $reserve{'reserve_group_id'} = $res->reserve_group_id; + $reserve{'hold_group_id'} = $res->hold_group_id; push( @reserveloop, \%reserve ); } -- 2.1.4