Attachment #138728 for bug #27272

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

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt (-3 / +5 lines)
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 %]

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-6 / +12 lines)
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 315-321 Link Here
315	[% IF ( itemsloo.notforloan ) %]	317	[% IF ( itemsloo.notforloan ) %]
316	<span class="noholdstext">No holds allowed</span>	318	<span class="noholdstext">No holds allowed</span>
317	[% ELSE %]	319	[% ELSE %]
318	[% IF ( itemsloo.ITEM_RESULTS.size ) %]	320	[% IF ( itemsloo.ITEM_RESULTS.count ) %]
319	<a id="reserve_[% itemsloo.biblionumber \| html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| html %]">Holds</a>	321	<a id="reserve_[% itemsloo.biblionumber \| html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| html %]">Holds</a>
320	[% IF ( holdfor ) %] <span class="holdforlink">\| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| uri %]&findborrower=[% holdfor_patron.cardnumber \| uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>[% END %]	322	[% IF ( holdfor ) %] <span class="holdforlink">\| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber \| uri %]&findborrower=[% holdfor_patron.cardnumber \| uri %]">Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %]</a></span>[% END %]
321	[% ELSE %]	323	[% ELSE %]
Lines 334-345 Link Here
334	<td>[% itemsloo.dateadded \| $KohaDates%]</td>	336	<td>[% itemsloo.dateadded \| $KohaDates%]</td>
335	<td>	337	<td>
336	<ul>	338	<ul>
337	[% FOREACH result IN itemsloo.ITEM_RESULTS %]	339	[% FOREACH item IN itemsloo.ITEM_RESULTS %]
338	<li>	340	<li>
339	[% result.holdingbranch \| html %]	341	[% Branches.GetName(item.holdingbranch) \| html %]
340	[% IF ( result.location_intranet ) %]<span class="shelvingloc">[% result.location_intranet \| html %]</span>[% END %]	342	[% IF ( item.location ) %]
341	[% IF ( result.itemcallnumber ) %]	343	<span class="shelvingloc">
342	[<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=%22[% result.itemcallnumber \|uri %]%22">[% result.itemcallnumber \| html %]</a>]	344	[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) \| html %]
		345	</span>
		346	[% END %]
		347	[% IF ( item.itemcallnumber ) %]
		348	[<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=%22[% item.itemcallnumber \| uri %]%22">[% item.itemcallnumber \| html %]</a>]
343	[% END %]	349	[% END %]
344	</li>	350	</li>
345	[% END %]	351	[% END %]




    GetMarcISBN
    GetMarcSubjects
);
use C4::Items qw( GetItemsInfo );
use C4::Output qw(
    output_html_with_http_headers
    output_and_exit

        my $marcauthorsarray = $biblio->get_marc_authors;
        my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );

        my $items = $biblio->items;

        $dat->{ISBN}           = GetMarcISBN($record, $marcflavour);
        $dat->{MARCSUBJCTS}    = $marcsubjctsarray;
        $dat->{MARCAUTHORS}    = $marcauthorsarray;
        $dat->{'biblionumber'} = $biblionumber;
        $dat->{ITEM_RESULTS}   = $items;
        $dat->{HASAUTHORS}     = $dat->{'author'} || @$marcauthorsarray;

        $iso2709 .= $record->as_usmarc();




    GetNormalizedOCLCNumber
    GetNormalizedUPC
);
use C4::Items qw( GetItemsLocationInfo );
use C4::Members;
use C4::Output qw( pagination_bar output_html_with_http_headers );
use C4::XSLT qw( XSLTParse4Display );

                }

                # Getting items infos for location display
                my $items = $biblio->items;
                $this_item->{'ITEM_RESULTS'} = $items;
                $this_item->{biblionumber} = $biblionumber;
                push @items, $this_item;
            }
- 

Return to bug 27272

Lines 29-35 use C4::Biblio qw( Link Here

(-)a/virtualshelves/sendshelf.pl (-3 / +2 lines)
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();

Lines 28-34 use C4::Koha qw( Link Here

(-)a/virtualshelves/shelves.pl (-4 / +2 lines)
28	GetNormalizedOCLCNumber	28	GetNormalizedOCLCNumber
29	GetNormalizedUPC	29	GetNormalizedUPC
30	);	30	);
31	use C4::Items qw( GetItemsLocationInfo );
32	use C4::Members;	31	use C4::Members;
33	use C4::Output qw( pagination_bar output_html_with_http_headers );	32	use C4::Output qw( pagination_bar output_html_with_http_headers );
34	use C4::XSLT qw( XSLTParse4Display );	33	use C4::XSLT qw( XSLTParse4Display );
Lines 323-330 if ( $op eq 'view' ) { Link Here
323	}	322	}
324		323
325	# Getting items infos for location display	324	# Getting items infos for location display
326	my @items_infos = &GetItemsLocationInfo( $biblionumber );	325	my $items = $biblio->items;
327	$this_item->{'ITEM_RESULTS'} = \@items_infos;	326	$this_item->{'ITEM_RESULTS'} = $items;
328	$this_item->{biblionumber} = $biblionumber;	327	$this_item->{biblionumber} = $biblionumber;
329	push @items, $this_item;	328	push @items, $this_item;
330	}	329	}
331	-