From c6984d38516ae82ddc6ba2689e1bd31379e7fb91 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 12 Mar 2013 14:30:48 -0400 Subject: [PATCH] Bug 9575 - Serious Holds Problem with IndependantBranches Test plan: 1) Disable IndependantBranches 2) Place 3 holds on a record with 3 different pickup locations 3) Enable IndependantBranches 4) Refresh the holds page for that record, all the holds show now show a pickup location of the logged in branch 5) Modify the order of the holds 6) Disable IndependantBranches 7) Refresh the holds, verify the holds all now have a pickup location of the logged in branch 8) Apply the patch 9) Repeat steps 1-3 10) Refresh the holds page for that record, all the holds should now show the correct pickup branch, but it cannot be changed as IndependantBranches is enabled. Signed-off-by: Kyle M Hall --- reserve/request.pl | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/reserve/request.pl b/reserve/request.pl index 5bcaca2..7f3f423 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -47,7 +47,7 @@ use Koha::DateUtils; my $dbh = C4::Context->dbh; my $sth; my $input = new CGI; -my ( $template, $borrowernumber, $cookie ) = get_template_and_user( +my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( { template_name => "reserve/request.tmpl", query => $input, @@ -567,10 +567,16 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'barcode'} = $res->{'barcode'}; $reserve{'priority'} = $res->{'priority'}; $reserve{'lowestPriority'} = $res->{'lowestPriority'}; - $reserve{'branchloop'} = GetBranchesLoop($res->{'branchcode'}); $reserve{'optionloop'} = \@optionloop; $reserve{'suspend'} = $res->{'suspend'}; $reserve{'suspend_until'} = $res->{'suspend_until'}; + + if ( C4::Context->preference('IndependantBranches') && $flags->{'superlibrarian'} != 1 ) { + $reserve{'branchloop'} = [ GetBranchDetail($res->{'branchcode'}) ]; + } else { + $reserve{'branchloop'} = GetBranchesLoop($res->{'branchcode'}); + } + push( @reserveloop, \%reserve ); } -- 1.7.2.5