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 1240-1246 Link Here
1240
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info | $raw %]</div>
1240
                            <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info | $raw %]</div>
1241
1241
1242
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1242
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1243
                                <span class="shelvingloc">[% ITEM_RESULT.location_description | html %]</span>
1243
                                <span class="shelvingloc">
1244
                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.permanent_location, opac => '1' ) | html %]
1245
                                    [% IF ITEM_RESULT.location AND ITEM_RESULT.location != ITEM_RESULT.permanent_location %]
1246
                                        ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location, opac => '1' ) | html %])
1247
                                    [% END %]
1248
                                </span>
1244
                            [% END %]
1249
                            [% END %]
1245
1250
1246
                        </td>
1251
                        </td>
Lines 1265-1271 Link Here
1265
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info | $raw %]</div>
1270
                            <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info | $raw %]</div>
1266
1271
1267
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1272
                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
1268
                                <span class="shelvingloc">[% ITEM_RESULT.location_description | html %]</span>
1273
                                <span class="shelvingloc">
1274
                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.permanent_location, opac => '1' ) | html %]
1275
                                    [% IF ITEM_RESULT.location AND ITEM_RESULT.location != ITEM_RESULT.permanent_location %]
1276
                                        ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location, opac => '1' ) | html %])
1277
                                    [% END %]
1278
                                </span>
1269
                            [% END %]
1279
                            [% END %]
1270
1280
1271
                        </td>
1281
                        </td>
(-)a/opac/opac-detail.pl (-4 lines)
Lines 682-690 if ( not $viewallitems and @items > $max_items_to_display ) { Link Here
682
    $itm->{'ccode'} = $collections->{$ccode} if defined($ccode) && $collections && exists( $collections->{$ccode} );
682
    $itm->{'ccode'} = $collections->{$ccode} if defined($ccode) && $collections && exists( $collections->{$ccode} );
683
    my $copynumber = $itm->{'copynumber'};
683
    my $copynumber = $itm->{'copynumber'};
684
    $itm->{'copynumber'} = $copynumbers->{$copynumber} if ( defined($copynumbers) && defined($copynumber) && exists( $copynumbers->{$copynumber} ) );
684
    $itm->{'copynumber'} = $copynumbers->{$copynumber} if ( defined($copynumbers) && defined($copynumber) && exists( $copynumbers->{$copynumber} ) );
685
    if ( defined $itm->{'location'} ) {
686
        $itm->{'location_description'} = $shelflocations->{ $itm->{'location'} };
687
    }
688
    if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) {
685
    if (exists $itm->{itype} && defined($itm->{itype}) && exists $itemtypes->{ $itm->{itype} }) {
689
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
686
        $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
690
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
687
        $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
691
- 

Return to bug 18355