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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-3 / +5 lines)
Lines 1-4 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE AuthorisedValues %]
3
[% USE Branches %]
2
<SUBJECT>
4
<SUBJECT>
3
Your list: [% shelfname | $raw %]
5
Your list: [% shelfname | $raw %]
4
<END_SUBJECT>
6
<END_SUBJECT>
Lines 144-155 Your list: [% shelfname | $raw %] Link Here
144
                In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber | html %]
146
                In online catalog: [% OPACBaseURL | $raw %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber | html %]
145
            </p>
147
            </p>
146
            [% END %]
148
            [% END %]
147
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.size ) %]
149
            [% IF ( BIBLIO_RESULT.ITEM_RESULTS.count ) %]
148
            <p>Items:
150
            <p>Items:
149
            <ul>
151
            <ul>
150
                [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
152
                [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]<li>
151
                    [% ITEM_RESULT.branchname | $raw %]
153
                    [% Branches.GetName(ITEM_RESULT.holdingbranch) | $raw %]
152
                    [% ITEM_RESULT.location | $raw %]
154
                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %]%]
153
                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber | $raw %])[% END %]
155
                    [% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber | $raw %])[% END %]
154
                    [% ITEM_RESULT.barcode | $raw %]
156
                    [% ITEM_RESULT.barcode | $raw %]
155
                </li>[% END %]
157
                </li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-6 / +12 lines)
Lines 2-7 Link Here
2
[% USE Asset %]
2
[% USE Asset %]
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE AuthorisedValues %]
6
[% USE Branches %]
5
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
7
<title>
9
<title>
Lines 274-280 Link Here
274
                        [% IF ( itemsloo.notforloan ) %]
276
                        [% IF ( itemsloo.notforloan ) %]
275
                            <span class="noholdstext">No holds allowed</span>
277
                            <span class="noholdstext">No holds allowed</span>
276
                        [% ELSE %]
278
                        [% ELSE %]
277
                            [% IF ( itemsloo.ITEM_RESULTS.size ) %]
279
                            [% IF ( itemsloo.ITEM_RESULTS.count ) %]
278
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
280
                                <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a>
279
                                [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
281
                                [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&amp;findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %]
280
                            [% ELSE %]
282
                            [% ELSE %]
Lines 293-304 Link Here
293
            <td>[% itemsloo.dateadded | $KohaDates%]</td>
295
            <td>[% itemsloo.dateadded | $KohaDates%]</td>
294
            <td>
296
            <td>
295
                <ul>
297
                <ul>
296
                [% FOREACH result IN itemsloo.ITEM_RESULTS %]
298
                [% FOREACH item IN itemsloo.ITEM_RESULTS %]
297
                    <li>
299
                    <li>
298
                        [% result.holdingbranch | html %]
300
                        [% Branches.GetName(item.holdingbranch) | html %]
299
                        [% IF ( result.location_intranet ) %]<span class="shelvingloc">[% result.location_intranet | html %]</span>[% END %]
301
                        [% IF ( item.location ) %]
300
                        [% IF ( result.itemcallnumber ) %]
302
                            <span class="shelvingloc">
301
                            [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% result.itemcallnumber |uri %]%22">[% result.itemcallnumber | html %]</a>]
303
                                [% SET AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %]%]
304
                            </span>
305
                        [% END %]
306
                        [% IF ( item.itemcallnumber ) %]
307
                            [<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% item.itemcallnumber | uri %]%22">[% item.itemcallnumber | html %]</a>]
302
                        [% END %]
308
                        [% END %]
303
                    </li>
309
                    </li>
304
                [% END %]
310
                [% END %]
(-)a/virtualshelves/sendshelf.pl (-3 / +2 lines)
Lines 29-35 use C4::Biblio qw( Link Here
29
    GetMarcISBN
29
    GetMarcISBN
30
    GetMarcSubjects
30
    GetMarcSubjects
31
);
31
);
32
use C4::Items qw( GetItemsInfo );
33
use C4::Output qw(
32
use C4::Output qw(
34
    output_html_with_http_headers
33
    output_html_with_http_headers
35
    output_and_exit
34
    output_and_exit
Lines 83-95 if ($to_address) { Link Here
83
        my $marcauthorsarray = $biblio->get_marc_authors;
82
        my $marcauthorsarray = $biblio->get_marc_authors;
84
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
83
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
85
84
86
        my @items = GetItemsInfo($biblionumber);
85
        my $items = $biblio->items;
87
86
88
        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
87
        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
89
        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
88
        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
90
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
89
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
91
        $dat->{'biblionumber'} = $biblionumber;
90
        $dat->{'biblionumber'} = $biblionumber;
92
        $dat->{ITEM_RESULTS}   = \@items;
91
        $dat->{ITEM_RESULTS}   = $items;
93
        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
92
        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;
94
93
95
        $iso2709 .= $record->as_usmarc();
94
        $iso2709 .= $record->as_usmarc();
(-)a/virtualshelves/shelves.pl (-4 / +2 lines)
Lines 26-32 use C4::Koha qw( Link Here
26
    GetNormalizedOCLCNumber
26
    GetNormalizedOCLCNumber
27
    GetNormalizedUPC
27
    GetNormalizedUPC
28
);
28
);
29
use C4::Items qw( GetItemsLocationInfo );
30
use C4::Members;
29
use C4::Members;
31
use C4::Output qw( pagination_bar output_html_with_http_headers );
30
use C4::Output qw( pagination_bar output_html_with_http_headers );
32
use C4::XSLT qw( XSLTParse4Display );
31
use C4::XSLT qw( XSLTParse4Display );
Lines 302-309 if ( $op eq 'view' ) { Link Here
302
                }
301
                }
303
302
304
                # Getting items infos for location display
303
                # Getting items infos for location display
305
                my @items_infos = &GetItemsLocationInfo( $biblionumber );
304
                my $items = $biblio->items;
306
                $this_item->{'ITEM_RESULTS'} = \@items_infos;
305
                $this_item->{'ITEM_RESULTS'} = $items;
307
                $this_item->{biblionumber} = $biblionumber;
306
                $this_item->{biblionumber} = $biblionumber;
308
                push @items, $this_item;
307
                push @items, $this_item;
309
            }
308
            }
310
- 

Return to bug 27272