From bc81c1d97838180b09a2051ca391f0784ccc71b6 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxintiative.org>
Date: Mon, 13 Aug 2018 17:25:51 -0400
Subject: [PATCH] if the basket page is used to clear all items from basket,
 return to original referrer

Signed-off-by: Galen Charlton <gmc@equinoxintiative.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm | 5 +++++
 Open-ILS/src/templates/opac/parts/anon_list.tt2                | 1 +
 2 files changed, 6 insertions(+)

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 65f08e6544..6b076720ee 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Container.pm
@@ -303,6 +303,11 @@ sub load_mylist_move {
         $cache_key, (ref $self)->CART_CACHE_MYLIST, \@keep
     );
 
+    if ($action eq 'delete' && scalar(@keep) == 0) {
+        my $url = $self->cgi->param('orig_referrer') // $self->ctx->{referer};
+        return $self->generic_redirect($url);
+    }
+
     if ($self->ctx->{user} and $action =~ /^\d+$/) {
         # in this case, action becomes list_id
         $self->load_myopac_bookbag_update('add_rec', $self->cgi->param('action'));
diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index d9bd3e9e2f..77aec1e43e 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="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;">
             <select name="action">
-- 
2.11.0