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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-2 / +12 lines)
Lines 1247-1253 Link Here
1247
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info | $raw %]</div>
1247
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info | $raw %]</div>
1248
1248
1249
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1249
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1250
                                <span class="shelvingloc">[% ITEM_RESULT.location_description | html %]</span>
1250
                                <span class="shelvingloc">
1251
                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.permanent_location, opac => '1' ) | html %]
1252
                                    [% IF ITEM_RESULT.location AND ITEM_RESULT.location != ITEM_RESULT.permanent_location %]
1253
                                        ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location, opac => '1' ) | html %])
1254
                                    [% END %]
1255
                                </span>
1251
                            [% END %]
1256
                            [% END %]
1252
1257
1253
                        </td>
1258
                        </td>
Lines 1272-1278 Link Here
1272
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info | $raw %]</div>
1277
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info | $raw %]</div>
1273
1278
1274
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1279
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1275
                                <span class="shelvingloc">[% ITEM_RESULT.location_description | html %]</span>
1280
                                <span class="shelvingloc">
1281
                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.permanent_location, opac => '1' ) | html %]
1282
                                    [% IF ITEM_RESULT.location AND ITEM_RESULT.location != ITEM_RESULT.permanent_location %]
1283
                                        ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location, opac => '1' ) | html %])
1284
                                    [% END %]
1285
                                </span>
1276
                            [% END %]
1286
                            [% END %]
1277
1287
1278
                        </td>
1288
                        </td>
(-)a/opac/opac-detail.pl (-4 lines)
Lines 694-702 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here
694
    $itm->{'ccode'} = $collections->{$ccode} if defined($ccode) && $collections && exists( $collections->{$ccode} );
694
    $itm->{'ccode'} = $collections->{$ccode} if defined($ccode) && $collections && exists( $collections->{$ccode} );
695
    my $copynumber = $itm->{'copynumber'};
695
    my $copynumber = $itm->{'copynumber'};
696
    $itm->{'copynumber'} = $copynumbers->{$copynumber} if ( defined($copynumbers) && defined($copynumber) && exists( $copynumbers->{$copynumber} ) );
696
    $itm->{'copynumber'} = $copynumbers->{$copynumber} if ( defined($copynumbers) && defined($copynumber) && exists( $copynumbers->{$copynumber} ) );
697
    if ( defined $itm->{'location'} ) {
698
        $itm->{'location_description'} = $shelflocations->{ $itm->{'location'} };
699
    }
700
    if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) {
697
    if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) {
701
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
698
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
702
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
699
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
703
- 

Return to bug 18355