From b5dfc904407d4c01b5c990a9abf6f54cc76c9c8c Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 29 Apr 2018 18:56:38 -0400
Subject: [PATCH] LP#1737812: Simplify holdings tranfser options

Instead of providing direct actions for transfer of library, or record, or
both, have just one volume transfer option that Does the Right Thing (tm).

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 .../src/templates/staff/cat/catalog/t_holdings.tt2  | 21 +++++++++++++++++++++
 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js |  1 +
 2 files changed, 22 insertions(+)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
index d30ad1ab67..a1e4b35371 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -49,6 +49,9 @@
       label="[% l('Request Items') %]"></eg-grid-action>
     <eg-grid-action handler="attach_to_peer_bib"
       label="[% l('Link as Conjoined to Previously Marked Bib Record') %]"></eg-grid-action>
+    <eg-grid-action handler="markLibAsVolTarget"
+      label="[% l('Choose Library for Volume/Copy Transfer Destination') %]"></eg-grid-action>
+
     <eg-grid-action handler="selectedHoldingsItemStatus" group="[% l('Show') %]"
       label="[% l('Item Status (list)') %]"></eg-grid-action>
     <eg-grid-action handler="selectedHoldingsItemStatusDetail" group="[% l('Show') %]"
@@ -96,9 +99,27 @@
     <eg-grid-action handler="selectedHoldingsVolCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
       label="[% l('Delete Call Numbers and Items') %]"></eg-grid-action>
 
+<<<<<<< HEAD
     <eg-grid-action handler="transferVolumes" group="[% l('Transfer') %]"
       label="[% l('Call Numbers to Previously Marked Destination') %]"></eg-grid-action>
 
+=======
+<!--
+    <eg-grid-action handler="transferVolumesToRecord" group="[% l('Transfer') %]"
+      label="[% l('Volumes to Previously Marked Record') %]"></eg-grid-action>
+    <eg-grid-action handler="transferVolumesToLibrary" group="[% l('Transfer') %]"
+      label="[% l('Volumes to Previously Marked Library') %]"></eg-grid-action>
+-->
+
+    <eg-grid-action handler="transferVolumesToRecordAndLibrary" group="[% l('Transfer') %]"
+      label="[% l('Volumes to Previously Marked Destination') %]"></eg-grid-action>
+
+<!--
+    <eg-grid-action handler="changeItemOwningLib" group="[% l('Transfer') %]"
+      label="[% l('Copies to Previously Marked Library') %]"></eg-grid-action>
+-->
+
+>>>>>>> 77ed2fe... LP#1737812: Simplify holdings tranfser options
     <eg-grid-action handler="transferItems" group="[% l('Transfer') %]"
       label="[% l('Items to Previously Marked Destination') %]"></eg-grid-action>
 
diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index c853cb8686..0c9e500465 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
@@ -1417,6 +1417,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
             // or vol-collapsed row
             egCore.hatch.removeLocalItem('eg.cat.transfer_target_vol');
         }
+
         ngToast.create(egCore.strings.MARK_HOLDINGS_TARGET);
     }
 
-- 
2.11.0