Merge branch 'bug_9292' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-01-13 08:39:00 -05:00
commit 73d84bc362
3 changed files with 0 additions and 16 deletions

View file

@ -197,10 +197,6 @@ foreach my $item (@items) {
# 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})
: '';

View file

@ -529,11 +529,6 @@ for my $itm (@items) {
&& (not $itemtypes->{$itm->{'itype'}}->{notforloan} )
&& ($itm->{'itemnumber'} ) );
if ( defined $itm->{'publictype'} ) {
# I can't actually find any case in which this is defined. --amoore 2008-12-09
$itm->{ $itm->{'publictype'} } = 1;
}
# get collection code description, too
my $ccode = $itm->{'ccode'};
$itm->{'ccode'} = $collections->{$ccode} if ( defined($collections) && exists( $collections->{$ccode} ) );

View file

@ -173,11 +173,6 @@ if ($issues){
}
$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'});
@ -258,8 +253,6 @@ foreach my $res (@reserves) {
$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'});