Attachment #15674 for bug #9458

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

Lines 255-261 from C4::Circulation. Link Here

(-)a/C4/VirtualShelves.pm (-2 / +2 lines)
255	=cut	255	=cut
256		256
257	sub GetShelfContents {	257	sub GetShelfContents {
258	my ($shelfnumber, $row_count, $offset, $sortfield) = @_;	258	my ($shelfnumber, $row_count, $offset, $sortfield, $sort_direction ) = @_;
259	my $dbh=C4::Context->dbh();	259	my $dbh=C4::Context->dbh();
260	my $sth1 = $dbh->prepare("SELECT count(*) FROM virtualshelfcontents WHERE shelfnumber = ?");	260	my $sth1 = $dbh->prepare("SELECT count(*) FROM virtualshelfcontents WHERE shelfnumber = ?");
261	$sth1->execute($shelfnumber);	261	$sth1->execute($shelfnumber);
Lines 277-283 sub GetShelfContents { Link Here
277	my @params = ($shelfnumber);	277	my @params = ($shelfnumber);
278	if($sortfield) {	278	if($sortfield) {
279	$query .= " ORDER BY " . $sortfield;	279	$query .= " ORDER BY " . $sortfield;
280	$query .= " DESC " if ($sortfield eq 'copyrightdate');	280	$query .= " DESC " if ( ( $sortfield eq 'copyrightdate' ) \|\| ( $sort_direction eq 'desc' ) );
281	}	281	}
282	if($row_count){	282	if($row_count){
283	$query .= " LIMIT ?, ? ";	283	$query .= " LIMIT ?, ? ";

Lines 249-255 sub shelfpage { Link Here

(-)a/C4/VirtualShelves/Page.pm (-2 / +6 lines)
249	my $items;	249	my $items;
250	my $tag_quantity;	250	my $tag_quantity;
251	my $sortfield = ( $sorton ? $sorton : 'title' );	251	my $sortfield = ( $sorton ? $sorton : 'title' );
252	( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield );	252	$sortfield = $query->param('sort') \|\| $sortfield; ## Passed in sorting overrides default sorting
		253	my $direction = $query->param('direction');
		254	( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction );
253	for my $this_item (@$items) {	255	for my $this_item (@$items) {
254	my $biblionumber = $this_item->{'biblionumber'};	256	my $biblionumber = $this_item->{'biblionumber'};
255	my $record = GetMarcBiblio($biblionumber);	257	my $record = GetMarcBiblio($biblionumber);
Lines 419-425 sub shelfpage { Link Here
419		421
420	my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl";	422	my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl";
421	my %qhash = ();	423	my %qhash = ();
422	foreach (qw(display viewshelf sortfield)) {	424	foreach (qw(display viewshelf sortfield sort direction)) {
423	$qhash{$_} = $query->param($_) if $query->param($_);	425	$qhash{$_} = $query->param($_) if $query->param($_);
424	}	426	}
425	( scalar keys %qhash ) and $url .= '?' . join '&', map { "$_=$qhash{$_}" } keys %qhash;	427	( scalar keys %qhash ) and $url .= '?' . join '&', map { "$_=$qhash{$_}" } keys %qhash;
Lines 459-464 sub shelfpage { Link Here
459	barshelvesloop => $barshelves,	461	barshelvesloop => $barshelves,
460	pubshelves => $total->{pubtotal},	462	pubshelves => $total->{pubtotal},
461	pubshelvesloop => $pubshelves,	463	pubshelvesloop => $pubshelves,
		464	sort => $query->param('sort'),
		465	direction => $query->param('direction'),
462	);	466	);
463		467
464	output_html_with_http_headers $query, $cookie, $template->output;	468	output_html_with_http_headers $query, $cookie, $template->output;




     <span class="clearall"></span></p>
 [% END %]
	
 [% IF direction == 'asc' %][% direction = 'desc' %][% ELSE %][% direction = 'asc' %][% END %]
 <div class="pages">[% pagination_bar %]</div>
    <table>
            <tr>
                [% IF ( itemsloop ) %]<th class="checkall">&nbsp;</th>[% END %]

                [% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]
                <th>
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=title&direction=[% direction %]">Title</a>
                    [% IF sort == 'title' %]
                        [% IF direction == 'asc' %]
                            <img src="/intranet-tmpl/prog/img/asc.gif" />
                        [% ELSIF direction == 'desc' %]
                            <img src="/intranet-tmpl/prog/img/desc.gif" />
                        [% END %]
                    [% END %]
                </th>
                <th>
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=author&direction=[% direction %]">Author</a>
                   [% IF sort == 'author' %]
                        [% IF direction == 'asc' %]
                            <img src="/intranet-tmpl/prog/img/asc.gif" />
                        [% ELSIF direction == 'desc' %]
                            <img src="/intranet-tmpl/prog/img/desc.gif" />
                        [% END %]
                    [% END %]
                 </th>
                <th>Date added</th>
                <th>
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=itemcallnumber&direction=[% direction %]">Call number</a>
                   [% IF sort == 'itemcallnumber' %]
                        [% IF direction == 'asc' %]
                            <img src="/intranet-tmpl/prog/img/asc.gif" />
                        [% ELSIF direction == 'desc' %]
                            <img src="/intranet-tmpl/prog/img/desc.gif" />
                        [% END %]
                    [% END %]
                 </th>
                <th>&nbsp;</th>
            </tr>
		[% FOREACH itemsloo IN itemsloop %]

Lines 188-193 $(function() { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt (-1 / +34 lines)
188	alert(alertString2);	188	alert(alertString2);
189	}	189	}
190	}	190	}
		191
		192	$(document).ready(function() {
		193	$('#sort-submit').hide();
		194	});
		195
191	//]]>	196	//]]>
192	</script>	197	</script>
193	</head>	198	</head>
Lines 287-292 $(function() { Link Here
287		292
288	<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print list</a>	293	<a class="print" href="opac-shelves.pl" onclick="print(); return false;">Print list</a>
289		294
		295	<form action="/cgi-bin/koha/opac-shelves.pl" id="sorting-form">
		296	<input type="hidden" name="viewshelf" value="[% shelfnumber %]" />
		297
		298	<label for="sort">Sort by: </label>
		299	<select name="sort" onchange="$('#sorting-form').submit()">
		300	<option value="">Default sorting</option>
		301
		302	[% IF sort == 'author' %]
		303	<option value="author" selected="selected">Author</option>
		304	[% ELSE %]
		305	<option value="author">Author</option>
		306	[% END %]
		307
		308	[% IF sort == 'title' %]
		309	<option value="title" selected="selected">Title</option>
		310	[% ELSE %]
		311	<option value="title">Title</option>
		312	[% END %]
		313
		314	[% IF sort == 'itemcallnumber' %]
		315	<option value="itemcallnumber" selected="selected">Call number</option>
		316	[% ELSE %]
		317	<option value="itemcallnumber">Call number</option>
		318	[% END %]
		319
		320	<input type="submit" id="sort-submit" value="Resort list" />
		321	</select>
		322	</form>
		323
290	[% IF ( manageshelf ) %] <span class="sep">\|</span> <form method="get" action="opac-shelves.pl"><input type="hidden" name="op" value="modif" />	324	[% IF ( manageshelf ) %] <span class="sep">\|</span> <form method="get" action="opac-shelves.pl"><input type="hidden" name="op" value="modif" />
291	<input type="hidden" name="display" value="viewshelf" />	325	<input type="hidden" name="display" value="viewshelf" />
292	<input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit list" /></form>	326	<input type="hidden" name="shelfnumber" value="[% shelfnumber %]" /> <input type="submit" class="editshelf" value="Edit list" /></form>
293	-

Return to bug 9458

Lines 204-218 function placeHold () { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-3 / +32 lines)
204	<span class="clearall"></span></p>	204	<span class="clearall"></span></p>
205	[% END %]	205	[% END %]
206		206
		207	[% IF direction == 'asc' %][% direction = 'desc' %][% ELSE %][% direction = 'asc' %][% END %]
207	<div class="pages">[% pagination_bar %]</div>	208	<div class="pages">[% pagination_bar %]</div>
208	<table>	209	<table>
209	<tr>	210	<tr>
210	[% IF ( itemsloop ) %]<th class="checkall"> </th>[% END %]	211	[% IF ( itemsloop ) %]<th class="checkall"> </th>[% END %]
		212
211	[% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]	213	[% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %]
212	<th>Title</th>	214	<th>
213	<th>Author</th>	215	<a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=title&direction=[% direction %]">Title</a>
		216	[% IF sort == 'title' %]
		217	[% IF direction == 'asc' %]
		218	<img src="/intranet-tmpl/prog/img/asc.gif" />
		219	[% ELSIF direction == 'desc' %]
		220	<img src="/intranet-tmpl/prog/img/desc.gif" />
		221	[% END %]
		222	[% END %]
		223	</th>
		224	<th>
		225	<a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=author&direction=[% direction %]">Author</a>
		226	[% IF sort == 'author' %]
		227	[% IF direction == 'asc' %]
		228	<img src="/intranet-tmpl/prog/img/asc.gif" />
		229	[% ELSIF direction == 'desc' %]
		230	<img src="/intranet-tmpl/prog/img/desc.gif" />
		231	[% END %]
		232	[% END %]
		233	</th>
214	<th>Date added</th>	234	<th>Date added</th>
215	<th>Call number</th>	235	<th>
		236	<a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=itemcallnumber&direction=[% direction %]">Call number</a>
		237	[% IF sort == 'itemcallnumber' %]
		238	[% IF direction == 'asc' %]
		239	<img src="/intranet-tmpl/prog/img/asc.gif" />
		240	[% ELSIF direction == 'desc' %]
		241	<img src="/intranet-tmpl/prog/img/desc.gif" />
		242	[% END %]
		243	[% END %]
		244	</th>
216	<th> </th>	245	<th> </th>
217	</tr>	246	</tr>
218	[% FOREACH itemsloo IN itemsloop %]	247	[% FOREACH itemsloo IN itemsloop %]