From e45a5e5b034a76cf4cc75aab9c857338425e22e3 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 19 Feb 2013 08:42:11 -0500 Subject: [PATCH] Bug 9458 - Add sorting to lists - QA Followup Signed-off-by: Jonathan Druart --- C4/VirtualShelves.pm | 2 +- C4/VirtualShelves/Page.pm | 10 +++++---- .../prog/en/modules/virtualshelves/shelves.tt | 14 +++++++++---- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 22 +++++++++++++++++++- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm index f632416..37babc1 100644 --- a/C4/VirtualShelves.pm +++ b/C4/VirtualShelves.pm @@ -277,7 +277,7 @@ sub GetShelfContents { my @params = ($shelfnumber); if($sortfield) { $query .= " ORDER BY " . $sortfield; - $query .= " DESC " if ( ( $sortfield eq 'copyrightdate' ) || ( $sort_direction eq 'desc' ) ); + $query .= " DESC " if ( $sort_direction eq 'desc' ); } if($row_count){ $query .= " LIMIT ?, ? "; diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index ab807da..3dfbe60 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -249,8 +249,12 @@ sub shelfpage { my $items; my $tag_quantity; my $sortfield = ( $sorton ? $sorton : 'title' ); - $sortfield = $query->param('sort') || $sortfield; ## Passed in sorting overrides default sorting - my $direction = $query->param('direction'); + $sortfield = $query->param('sort') || $sortfield || 'title'; ## Passed in sorting overrides default sorting + my $direction = $query->param('direction') || 'asc'; + $template->param( + sort => $sortfield, + direction => $direction, + ); ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction ); for my $this_item (@$items) { my $biblionumber = $this_item->{'biblionumber'}; @@ -461,8 +465,6 @@ sub shelfpage { barshelvesloop => $barshelves, pubshelves => $total->{pubtotal}, pubshelvesloop => $pubshelves, - sort => $query->param('sort'), - direction => $query->param('direction'), ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index e9f3994..c02e454 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -204,7 +204,7 @@ function placeHold () {

[% END %] - [% IF direction == 'asc' %][% direction = 'desc' %][% ELSE %][% direction = 'asc' %][% END %] + [% IF direction == 'asc' %][% SET new_direction = 'desc' %][% ELSE %][% SET new_direction = 'asc' %][% END %]
[% pagination_bar %]
@@ -212,34 +212,40 @@ function placeHold () { [% UNLESS ( item_level_itypes ) %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 59bedc7..3ad295d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -317,8 +317,28 @@ $(document).ready(function() { [% END %] - + [% IF sort == 'copyrightdate' %] + + [% ELSE %] + + [% END %] + + + + + [% IF ( manageshelf ) %] | -- 1.7.10.4
Item type - Title + Title [% IF sort == 'title' %] [% IF direction == 'asc' %] [% ELSIF direction == 'desc' %] [% END %] + [% ELSE %] + [% END %] - Author + Author [% IF sort == 'author' %] [% IF direction == 'asc' %] [% ELSIF direction == 'desc' %] [% END %] + [% ELSE %] + [% END %] Date added - Call number + Call number [% IF sort == 'itemcallnumber' %] [% IF direction == 'asc' %] [% ELSIF direction == 'desc' %] [% END %] + [% ELSE %] + [% END %]