Attachment #14366 for bug #9292

View | Details | Raw Unified | Return to bug 9292
Collapse All | Expand All

Lines 197-206 foreach my $item (@items) { Link Here

(-)a/catalogue/detail.pl (-4 lines)
197	# can place holds defaults to yes	197	# can place holds defaults to yes
198	$norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) \|\| ( $item->{'itemnotforloan'} > 0 ) );	198	$norequests = 0 unless ( ( $item->{'notforloan'} > 0 ) \|\| ( $item->{'itemnotforloan'} > 0 ) );
199		199
200	# format some item fields for display
201	if ( defined $item->{'publictype'} ) {
202	$item->{ $item->{'publictype'} } = 1;
203	}
204	$item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})	200	$item->{imageurl} = defined $item->{itype} ? getitemtypeimagelocation('intranet', $itemtypes->{ $item->{itype} }{imageurl})
205	: '';	201	: '';
206		202

Lines 529-539 for my $itm (@items) { Link Here

(-)a/opac/opac-detail.pl (-5 lines)
529	&& (not $itemtypes->{$itm->{'itype'}}->{notforloan} )	529	&& (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
530	&& ($itm->{'itemnumber'} ) );	530	&& ($itm->{'itemnumber'} ) );
531		531
532	if ( defined $itm->{'publictype'} ) {
533	# I can't actually find any case in which this is defined. --amoore 2008-12-09
534	$itm->{ $itm->{'publictype'} } = 1;
535	}
536
537	# get collection code description, too	532	# get collection code description, too
538	my $ccode = $itm->{'ccode'};	533	my $ccode = $itm->{'ccode'};
539	$itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) );	534	$itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) );




        }
        $issue->{'charges'} = $charges;

        # get publictype for icon

        my $publictype = $issue->{'publictype'};
        $issue->{$publictype} = 1;

        # check if item is renewable
        my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
        ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});

      $res->{'expirationdate'} = '';
    }

    my $publictype = $res->{'publictype'};
    $res->{$publictype} = 1;
    $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
    $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
    my $biblioData = GetBiblioData($res->{'biblionumber'});
- 

Return to bug 9292

Lines 173-183 if ($issues){ Link Here

(-)a/opac/opac-user.pl (-8 lines)
173	}	173	}
174	$issue->{'charges'} = $charges;	174	$issue->{'charges'} = $charges;
175		175
176	# get publictype for icon
177
178	my $publictype = $issue->{'publictype'};
179	$issue->{$publictype} = 1;
180
181	# check if item is renewable	176	# check if item is renewable
182	my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );	177	my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
183	($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});	178	($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
Lines 258-265 foreach my $res (@reserves) { Link Here
258	$res->{'expirationdate'} = '';	253	$res->{'expirationdate'} = '';
259	}	254	}
260		255
261	my $publictype = $res->{'publictype'};
262	$res->{$publictype} = 1;
263	$res->{'waiting'} = 1 if $res->{'found'} eq 'W';	256	$res->{'waiting'} = 1 if $res->{'found'} eq 'W';
264	$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};	257	$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
265	my $biblioData = GetBiblioData($res->{'biblionumber'});	258	my $biblioData = GetBiblioData($res->{'biblionumber'});
266	-