From 8ee176d110c4dae5481ab9970900a7a5667ae611 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    | 11 ++++++++++-
 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js   | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

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 545374fc9b..29801235e7 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holdings.tt2
@@ -49,8 +49,10 @@
       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>
@@ -99,14 +101,21 @@
     <eg-grid-action handler="selectedHoldingsVolCopyDelete" group="[% l('Delete') %]" disabled="copies_not_shown"
       label="[% l('Volumes and Copies') %]"></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 Record and Library') %]"></eg-grid-action>
+      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>
+-->
+
     <eg-grid-action handler="transferItems" group="[% l('Transfer') %]"
       label="[% l('Items to Previously Marked Volume') %]"></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 fec7089273..30cea7bf8d 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
@@ -447,6 +447,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         ngToast.create(egCore.strings.MARK_VOL_TARGET);
         $scope.current_voltransfer_target = $scope.record_id;
         egCore.hatch.setLocalItem('eg.cat.marked_volume_transfer_record',$scope.record_id);
+        egCore.hatch.removeLocalItem('eg.cat.volume_transfer_target');
     };
 
     $scope.markOverlay = function () {
@@ -1341,6 +1342,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
     }
 
     $scope.markLibAsVolTarget = function() {
+        var recId = $scope.record_id;
         return $uibModal.open({
             templateUrl: './cat/catalog/t_choose_vol_target_lib',
             backdrop: 'static',
@@ -1357,6 +1359,10 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                         'eg.cat.volume_transfer_target',
                         org.id()
                     );
+                    egCore.hatch.setLocalItem(
+                        'eg.cat.marked_volume_transfer_record',
+                        recId
+                    );
                     $uibModalInstance.close();
                 }
                 $scope.cancel = function($event) {
@@ -1371,6 +1377,10 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
             'eg.cat.volume_transfer_target',
             $scope.holdingsGridControls.selectedItems()[0].owner_id
         );
+        egCore.hatch.setLocalItem(
+            'eg.cat.marked_volume_transfer_record',
+            $scope.record_id
+        );
         ngToast.create(egCore.strings.MARK_VOL_TARGET);
     }
 
-- 
2.43.2