From: Galen Charlton <gmc@equinoxintiative.org>
Date: Mon, 13 Aug 2018 21:47:03 +0000 (-0400)
Subject: show only current basket when invoking the lists page from a 'create list from basket... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f3636c354181ef70343eb433c50b08ca4f8ba63e;p=working%2FEvergreen.git

show only current basket when invoking the lists page from a 'create list from basket' action

Signed-off-by: Galen Charlton <gmc@equinoxintiative.org>
---

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index b34bba73eb..3f765172b8 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -89,6 +89,10 @@
         </table>
     </form>
 
+    [% IF CGI.param('from_basket'); %]
+    <h1>[% l("... from basket") %]</h1>
+    [% INCLUDE "opac/parts/anon_list.tt2" %]
+    [% ELSE %]
     <h1>[% l("My Existing Basket and Lists") %]</h1>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     [% IF ctx.bookbags.size %]
@@ -485,5 +489,6 @@
         [% END %]
     </div>
     [% END %]
+    [% END %]
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/cart.tt2 b/Open-ILS/src/templates/opac/parts/cart.tt2
index f4e89bc729..ae587bcb80 100644
--- a/Open-ILS/src/templates/opac/parts/cart.tt2
+++ b/Open-ILS/src/templates/opac/parts/cart.tt2
@@ -7,7 +7,7 @@
       <option value="[% mkurl(ctx.opac_root _ '/mylist/print', {}) %]">[% l('Print Title Details') %]</option>
       <option value="[% mkurl(ctx.opac_root _ '/mylist/email', {}) %]">[% l('Email Title Details') %]</option>
       [% IF !ctx.is_browser_staff %]
-      <option value="[% mkurl(ctx.opac_root _ '/myopac/lists', { move_cart_by_default => 1 }) %]">[% l('Add Basket to Saved List') %]</option>
+      <option value="[% mkurl(ctx.opac_root _ '/myopac/lists', { move_cart_by_default => 1, from_basket => 1 }) %]">[% l('Add Basket to Saved List') %]</option>
       [% END %]
       [% IF ctx.is_browser_staff %]
       <option value="add_cart_to_bucket">[% l('Add Basket to Bucket') %]</option>
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index 68fd3bb238..e9b58ffb1d 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -36,7 +36,7 @@
                 </div>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type', 'hid']) %]"
                     class="opac-button">[% l('My Account') %]</a>
-                <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id', 'hid']) %]"
+                <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id', 'hid', 'from_basket']) %]"
                     class="opac-button">[% l('My Lists') %]</a>
                 <a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
                     class="opac-button" id="logout_link">[% l('Logout') %]</a>