projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 10856: Improve the previous and next items on the shelf browser
[koha.git]
/
opac
/
opac-reserve.pl
diff --git
a/opac/opac-reserve.pl
b/opac/opac-reserve.pl
index
fbc9dd7
..
4bba9a6
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;
@@
-171,7
+170,6
@@
foreach my $biblioNumber (@biblionumbers) {
#
#
if ( $query->param('place_reserve') ) {
#
#
if ( $query->param('place_reserve') ) {
- my $notes = $query->param('notes');
my $reserve_cnt = 0;
if ($MAXIMUM_NUMBER_OF_RESERVES) {
$reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber );
my $reserve_cnt = 0;
if ($MAXIMUM_NUMBER_OF_RESERVES) {
$reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber );
@@
-255,6
+253,7
@@
if ( $query->param('place_reserve') ) {
# Inserts a null into the 'itemnumber' field of 'reserves' table.
$itemNum = undef;
}
# Inserts a null into the 'itemnumber' field of 'reserves' table.
$itemNum = undef;
}
+ my $notes = $query->param('notes_'.$biblioNum)||'';
if ( $MAXIMUM_NUMBER_OF_RESERVES
&& $reserve_cnt >= $MAXIMUM_NUMBER_OF_RESERVES )
if ( $MAXIMUM_NUMBER_OF_RESERVES
&& $reserve_cnt >= $MAXIMUM_NUMBER_OF_RESERVES )
@@
-350,7
+349,7
@@
my $notforloan_label_of = get_notforloan_label_of();
my $biblioLoop = [];
my $numBibsAvailable = 0;
my $itemdata_enumchron = 0;
my $biblioLoop = [];
my $numBibsAvailable = 0;
my $itemdata_enumchron = 0;
-my $anyholdable;
+my $anyholdable
= 0
;
my $itemLevelTypes = C4::Context->preference('item-level_itypes');
$template->param('item_level_itypes' => $itemLevelTypes);
my $itemLevelTypes = C4::Context->preference('item-level_itypes');
$template->param('item_level_itypes' => $itemLevelTypes);
@@
-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};
@@
-374,6
+373,7
@@
foreach my $biblioNum (@biblionumbers) {
$biblioLoopIter{rank} = $biblioData->{rank};
$biblioLoopIter{reservecount} = $biblioData->{reservecount};
$biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
$biblioLoopIter{rank} = $biblioData->{rank};
$biblioLoopIter{reservecount} = $biblioData->{reservecount};
$biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
+ $biblioLoopIter{mandatorynotes}=0; #FIXME: For future use
if (!$itemLevelTypes && $biblioData->{itemtype}) {
$biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description};
if (!$itemLevelTypes && $biblioData->{itemtype}) {
$biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description};
@@
-490,7
+490,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::Context->preference('ReservesControlBranch') eq 'ItemHomeLibrary' ) ? $itemInfo->{'homebranch'} : $borr->{'branchcode'}
;
+ my $branch =
GetReservesControlBranch( $itemInfo, $borr )
;
my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
my $policy_holdallowed = 1;
my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
my $policy_holdallowed = 1;
@@
-527,31
+527,38
@@
foreach my $biblioNum (@biblionumbers) {
$numBibsAvailable++;
$biblioLoopIter{bib_available} = 1;
$biblioLoopIter{holdable} = 1;
$numBibsAvailable++;
$biblioLoopIter{bib_available} = 1;
$biblioLoopIter{holdable} = 1;
- $anyholdable = 1;
}
if ($biblioLoopIter{already_reserved}) {
$biblioLoopIter{holdable} = undef;
}
if ($biblioLoopIter{already_reserved}) {
$biblioLoopIter{holdable} = undef;
- $anyholdable = undef;
}
if(not CanBookBeReserved($borrowernumber,$biblioNum)){
$biblioLoopIter{holdable} = undef;
}
if(not CanBookBeReserved($borrowernumber,$biblioNum)){
$biblioLoopIter{holdable} = undef;
- $anyholdable = undef;
+ }
+ if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) {
+ $biblioLoopIter{holdable} = undef;
+ $biblioLoopIter{already_patron_possession} = 1;
}
}
+ if( $biblioLoopIter{holdable} ){ $anyholdable++; }
+
push @$biblioLoop, \%biblioLoopIter;
}
push @$biblioLoop, \%biblioLoopIter;
}
-if ( $numBibsAvailable == 0 ||
!$anyholdable
) {
+if ( $numBibsAvailable == 0 ||
$anyholdable == 0
) {
$template->param( none_available => 1 );
}
$template->param( none_available => 1 );
}
-my $itemTableColspan =
7
;
+my $itemTableColspan =
9
;
if (! $template->{VARS}->{'OPACItemHolds'}) {
$itemTableColspan--;
}
if (! $template->{VARS}->{'singleBranchMode'}) {
$itemTableColspan--;
}
if (! $template->{VARS}->{'OPACItemHolds'}) {
$itemTableColspan--;
}
if (! $template->{VARS}->{'singleBranchMode'}) {
$itemTableColspan--;
}
+$itemTableColspan-- if !$show_holds_count && !$show_priority;
+my $show_notes=C4::Context->preference('OpacHoldNotes');
+$template->param(OpacHoldNotes=>$show_notes);
+$itemTableColspan-- if !$show_notes;
$template->param(itemtable_colspan => $itemTableColspan);
# display infos
$template->param(itemtable_colspan => $itemTableColspan);
# display infos
@@
-568,7
+575,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;