projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 10741: restore holdability of in-transit items on OPAC search results
[koha_fer]
/
catalogue
/
detail.pl
diff --git
a/catalogue/detail.pl
b/catalogue/detail.pl
index
9379704
..
72258fd
100755
(executable)
--- a/
catalogue/detail.pl
+++ b/
catalogue/detail.pl
@@
-41,6
+41,7
@@
use C4::XSLT;
use C4::Images;
use Koha::DateUtils;
use C4::HTML5Media;
use C4::Images;
use Koha::DateUtils;
use C4::HTML5Media;
+use C4::CourseReserves qw(GetItemCourseReservesInfo);
# use Smart::Comments;
# use Smart::Comments;
@@
-138,9
+139,6
@@
if (@hostitems){
my $dat = &GetBiblioData($biblionumber);
my $dat = &GetBiblioData($biblionumber);
-# get count of holds
-my ( $holdcount, $holds ) = GetReservesFromBiblionumber($biblionumber,1);
-
#coping with subscriptions
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
my @subscriptions = GetSubscriptions( $dat->{title}, $dat->{issn}, undef, $biblionumber );
#coping with subscriptions
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
my @subscriptions = GetSubscriptions( $dat->{title}, $dat->{issn}, undef, $biblionumber );
@@
-197,10
+195,6
@@
foreach my $item (@items) {
# can place holds defaults to yes
$norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
# can place holds defaults to yes
$norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) );
- # format some item fields for display
- if ( defined $item->{'publictype'} ) {
- $item->{ $item->{'publictype'} } = 1;
- }
$item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})
: '';
$item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})
: '';
@@
-276,6
+270,10
@@
foreach my $item (@items) {
$materials_flag = 1;
}
$materials_flag = 1;
}
+ if ( C4::Context->preference('UseCourseReserves') ) {
+ $item->{'course_reserves'} = GetItemCourseReservesInfo( itemnumber => $item->{'itemnumber'} );
+ }
+
if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
and C4::Context->preference('SeparateHoldings')) {
if ($itembranchcode and $itembranchcode eq $currentbranch) {
if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET"
and C4::Context->preference('SeparateHoldings')) {
if ($itembranchcode and $itembranchcode eq $currentbranch) {
@@
-288,6
+286,14
@@
foreach my $item (@items) {
}
}
}
}
+# Display only one tab if one items list is empty
+if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) {
+ $template->param(SeparateHoldings => 0);
+ if (scalar(@itemloop) == 0) {
+ @itemloop = @otheritemloop;
+ }
+}
+
$template->param( norequests => $norequests );
$template->param(
MARCNOTES => $marcnotesarray,
$template->param( norequests => $norequests );
$template->param(
MARCNOTES => $marcnotesarray,
@@
-305,7
+311,6
@@
$template->param(
volinfo => $itemfields{enumchron},
itemdata_itemnotes => $itemfields{itemnotes},
z3950_search_params => C4::Search::z3950_search_args($dat),
volinfo => $itemfields{enumchron},
itemdata_itemnotes => $itemfields{itemnotes},
z3950_search_params => C4::Search::z3950_search_args($dat),
- holdcount => $holdcount,
hostrecords => $hostrecords,
analytics_flag => $analytics_flag,
C4::Search::enabled_staff_search_views,
hostrecords => $hostrecords,
analytics_flag => $analytics_flag,
C4::Search::enabled_staff_search_views,
@@
-355,6
+360,7
@@
$template->param(
subscriptions => \@subs,
subscriptionsnumber => $subscriptionsnumber,
subscriptiontitle => $dat->{title},
subscriptions => \@subs,
subscriptionsnumber => $subscriptionsnumber,
subscriptiontitle => $dat->{title},
+ searchid => $query->param('searchid'),
);
# $debug and $template->param(debug_display => 1);
);
# $debug and $template->param(debug_display => 1);
@@
-403,4
+409,7
@@
if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref
'sort'=>'-weight', limit=>$tag_quantity}));
}
'sort'=>'-weight', limit=>$tag_quantity}));
}
+my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
+$template->param( holdcount => $holdcount, holds => $holds );
+
output_html_with_http_headers $query, $cookie, $template->output;
output_html_with_http_headers $query, $cookie, $template->output;