projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 4862 - Change label of Browse by subject or author to Authority search
[koha.git]
/
opac
/
opac-reserve.pl
diff --git
a/opac/opac-reserve.pl
b/opac/opac-reserve.pl
index
bb23752
..
e725d30
100755
(executable)
--- a/
opac/opac-reserve.pl
+++ b/
opac/opac-reserve.pl
@@
-108,8
+108,7
@@
my $branch = $query->param('branch') || $borr->{'branchcode'} || C4::Context->us
$template->param( branch => $branch );
# make branch selection options...
$template->param( branch => $branch );
# make branch selection options...
-my $CGIbranchloop = GetBranchesLoop($branch);
-$template->param( CGIbranch => $CGIbranchloop );
+my $branchloop = GetBranchesLoop($branch);
# Is the person allowed to choose their branch
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
# Is the person allowed to choose their branch
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
@@
-358,7
+357,7
@@
foreach my $biblioNum (@biblionumbers) {
my $record = GetMarcBiblio($biblioNum);
# Init the bib item with the choices for branch pickup
my $record = GetMarcBiblio($biblioNum);
# Init the bib item with the choices for branch pickup
- my %biblioLoopIter = ( branch
ChoicesLoop => $CGI
branchloop );
+ my %biblioLoopIter = ( branch
loop => $
branchloop );
# Get relevant biblio data.
my $biblioData = $biblioDataHash{$biblioNum};
# Get relevant biblio data.
my $biblioData = $biblioDataHash{$biblioNum};
@@
-490,7
+489,7
@@
foreach my $biblioNum (@biblionumbers) {
# If there is no loan, return and transfer, we show a checkbox.
$itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0;
# If there is no loan, return and transfer, we show a checkbox.
$itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0;
- my $branch =
C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr)
;
+ my $branch =
( C4::Context->preference('ReservesControlBranch') eq 'ItemHomeLibrary' ) ? $itemInfo->{'homebranch'} : $borr->{'branchcode'}
;
my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
my $policy_holdallowed = 1;
my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
my $policy_holdallowed = 1;
@@
-537,6
+536,11
@@
foreach my $biblioNum (@biblionumbers) {
$biblioLoopIter{holdable} = undef;
$anyholdable = undef;
}
$biblioLoopIter{holdable} = undef;
$anyholdable = undef;
}
+ if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) {
+ $biblioLoopIter{holdable} = undef;
+ $biblioLoopIter{already_patron_possession} = 1;
+ $anyholdable = undef;
+ }
push @$biblioLoop, \%biblioLoopIter;
}
push @$biblioLoop, \%biblioLoopIter;
}
@@
-568,7
+572,5
@@
if (
);
}
);
}
-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
-
output_html_with_http_headers $query, $cookie, $template->output;
output_html_with_http_headers $query, $cookie, $template->output;