From 98143eabc7cf4a8ff67c67d4026688bef7f41c65 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 19 Feb 2013 08:42:11 -0500
Subject: [PATCH] Bug 9458 - Add sorting to lists - QA Followup

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit bc9f606ca7025417f3f2fddd393983cc0beec0ba)

Solved Conflicts:
	C4/VirtualShelves/Page.pm
	koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit bc9f606ca7025417f3f2fddd393983cc0beec0ba)
---
 C4/VirtualShelves.pm                          |  2 +-
 C4/VirtualShelves/Page.pm                     | 10 +++++----
 .../prog/en/modules/virtualshelves/shelves.tt | 10 ++++++---
 .../opac-tmpl/prog/en/modules/opac-shelves.tt | 22 ++++++++++++++++++-
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 9702ad9c00..46884169c0 100644
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -276,7 +276,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 61a4565d28..33b6fc14d1 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -258,8 +258,12 @@ sub shelfpage {
                 if ( $sortfield eq 'year' ) {
                     $yearsort = 'year';
                 }
-                $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'};
@@ -480,8 +484,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 8fad486e88..746441cc59 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 () {
      <span class="clearall"></span></p>
  [% END %]
 	
- [% IF direction == 'asc' %][% direction = 'desc' %][% ELSE %][% direction = 'asc' %][% END %]
+ [% IF direction == 'asc' %][% SET new_direction = 'desc' %][% ELSE %][% SET new_direction = 'asc' %][% END %]
  <div class="pages">[% pagination_bar %]</div>
     <table>
             <tr>
@@ -212,23 +212,27 @@ function placeHold () {
 
                 [% 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>
+                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=title&direction=[% new_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 %]
+                    [% ELSE %]
+                        <img src="/intranet-tmpl/prog/img/ascdesc.gif" />
                     [% END %]
                 </th>
                 <th>
-                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=author&direction=[% direction %]">Author</a>
+                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=[% shelfnumber %]&sort=author&direction=[% new_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 %]
+                    [% ELSE %]
+                        <img src="/intranet-tmpl/prog/img/ascdesc.gif" />
                     [% END %]
                  </th>
                 <th>Date added</th>
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 5a700a9c7d..f7c02d7f2c 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() {
             <option value="itemcallnumber">Call number</option>
         [% END %]
 
-        <input type="submit" id="sort-submit" value="Resort list" />
+        [% IF sort == 'copyrightdate' %]
+            <option value="copyrightdate" selected="selected">Copyright date</option>
+        [% ELSE %]
+            <option value="copyrightdate">Copyright date</option>
+        [% END %]
+    </select>
+
+    <select name="direction" onchange="$('#sorting-form').submit()">
+        [% IF direction == 'asc' %]
+            <option value="asc" selected="selected">Ascending</option>
+        [% ELSE %]
+            <option value="asc">Ascending</option>
+        [% END %]
+
+        [% IF direction == 'desc' %]
+            <option value="desc" selected="selected">Descending</option>
+        [% ELSE %]
+            <option value="desc">Descending</option>
+        [% END %]
     </select>
+
+    <input type="submit" id="sort-submit" value="Resort list" />
 </form>
 
                 [% IF ( manageshelf ) %] <span class="sep">|</span> <form method="get" action="opac-shelves.pl"><input type="hidden" name="op" value="modif" />
-- 
2.39.5