From b32a79533ec99bfef027ea3393bed3b83e317a78 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 18 Jan 2019 12:31:43 -0500
Subject: [PATCH] LP#1749475: Propagate sort option from anonymous buckets

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm   | 4 ++--
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm | 4 ++--
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm    | 2 +-
 Open-ILS/src/templates/opac/parts/anon_list.tt2                | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 75cfe12117..c1a7465ff4 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -2640,7 +2640,7 @@ sub load_myopac_bookbag_update {
         return $self->generic_redirect($url);
 
     } elsif ($action eq 'print') {
-        if (my $incoming_sort = $cgi->param('sort')) {
+        if (my $incoming_sort = $cgi->param('sort') || $cgi->param('anonsort')) {
             $incoming_sort =~ s/sort.*$//;
             $self->ctx->{sort} = $incoming_sort;
         }
@@ -2649,7 +2649,7 @@ sub load_myopac_bookbag_update {
         my $temp_cache_key = $self->_stash_record_list_in_anon_cache(@bib_ids);
         return $self->load_mylist_print($temp_cache_key);
     } elsif ($action eq 'email') {
-        if (my $incoming_sort = $cgi->param('sort')) {
+        if (my $incoming_sort = $cgi->param('sort') || $cgi->param('anonsort')) {
             $incoming_sort =~ s/sort.*$//;
             $self->ctx->{sort} = $incoming_sort;
         }
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
index ff39c2d537..738b4d64d0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
@@ -216,7 +216,7 @@ sub load_mylist_print {
     $url .= '?redirect_to=' . uri_escape_utf8($redirect);
     my $clear_cart = $self->cgi->param('clear_cart');
     $url .= '&clear_cart=1' if $clear_cart;
-    my $sort = $self->cgi->param('sort');
+    my $sort = $self->cgi->param('sort') || $self->cgi->param('anonsort');
     $url .= '&sort='.$sort if $sort;
     $url .= '&is_list=1';
 
@@ -244,7 +244,7 @@ sub load_mylist_email {
     $url .= '?redirect_to=' . uri_escape_utf8($redirect);
     my $clear_cart = $self->cgi->param('clear_cart');
     $url .= '&clear_cart=1' if $clear_cart;
-    my $sort = $self->cgi->param('sort');
+    my $sort = $self->cgi->param('sort') || $self->cgi->param('anonsort');
     $url .= '&sort='.$sort if $sort;
     $url .= '&is_list=1';
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
index 01165fa05d..303190b12d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm
@@ -575,7 +575,7 @@ sub load_print_or_email_preview {
 
     $ctx->{context_org} = $context_org->id;
 
-    my $incoming_sort = $self->cgi->param('sort') || 'author';
+    my $incoming_sort = $self->cgi->param('sort') || $self->cgi->param('anonsort') || 'author';
     $incoming_sort =~ s/sort.*$//;
 
     $incoming_sort = 'author'
diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index 56fbd6cee5..3cfec09a45 100644
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@ -13,6 +13,7 @@
             </form>
         </div>
         <form action="[% mkurl(ctx.opac_root _ '/mylist/move') %]" method="post">
+        <input type="hidden" name="anonsort" value="[% CGI.param('anonsort') %]" />
         <input type="hidden" name="orig_referrer" value="[% CGI.referer | html %]" />
         <input type="hidden" name="redirect_to" value="[% mkurl('', {}, ['list_none_selected', 'cart_none_selected']) %]" />
         <div class="bbag-action" style="clear:both;">
-- 
2.11.0