From: Jason Stephenson <jason@sigio.com>
Date: Sat, 27 Oct 2018 01:34:31 +0000 (-0400)
Subject: The final fixup. (I hope.)
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=725fd06203ad3ec273f4db52e16d2425d9eaed4f;p=working%2FEvergreen.git

The final fixup. (I hope.)
---

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 815f9d5efa..8e6f527130 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
@@ -1637,7 +1637,8 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
     $scope.selectedHoldingsDiscard = function () {
         var copy_list = gatherSelectedRawCopies();
         if (copy_list.length == 0) return;
-        egCirc.mark_discard(copy_list).then(function() {
+        egCirc.mark_discard(copy_list.map(function(cp) {
+            return {id: cp.id(), barcode: cp.barcode()};}).then(function() {
             holdinsSvcInst.fetchAgain().then(function() {
                 $scop.holdingsGridDataProvider.refresh();
             });
@@ -1647,7 +1648,8 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
     $scope.selectedHoldingsMissing = function () {
         var copy_list = gatherSelectedRawCopies();
         if (copy_list.length == 0) return;
-        egCirc.mark_missing(copy_list).then(function() {
+        egCirc.mark_missing(copy_list.map(function(cp) {
+            return {id: cp.id(), barcode: cp.barcode()};}).then(function() {
             holdingsSvcInst.fetchAgain().then(function() {
                 $scope.holdingsGridDataProvider.refresh();
             });
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 681a40f23f..a8142b9428 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -155,11 +155,17 @@ function($scope , $location , $timeout , egCore , egGridDataProvider , itemSvc)
     }
 
     $scope.selectedHoldingsDiscard = function () {
-        itemSvc.selectedHoldingsDiscard([$scope.args]);
+        itemSvc.selectedHoldingsDiscard([{
+            id : $scope.args.copyId,
+            barcode : $scope.args.barcode
+        }]);
     }
 
     $scope.selectedHoldingsMissing = function () {
-        itemSvc.selectedHoldingsMissing([$scope.args]);
+        itemSvc.selectedHoldingsMissing([{
+            id : $scope.args.copyId,
+            barcode : $scope.args.barcode
+        }]);
     }
 
     $scope.selectedHoldingsVolCopyAdd = function () {
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index 2a23a09839..a8e96fa60c 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -712,31 +712,47 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) {
     }
 
     service.mark_discard = function(items) {
-        var copies = [];
-        angular.forEach(items, function(item) {
-            if (item.copy) {
-                copies.push(item.copy);
-            }
-        });
-        if (copies.length) {
-            egCirc.mark_discard(copies).then(service.refresh):
-        }
+        var copies = items
+            .filter(function(item) { return Boolean(item.copy) })
+            .map(function(item) {
+                return
+                {
+                    id : item.copy.id(),
+                    barcode : item.copy.barcode()
+                };
+            });
+        if (copies.length)
+            egCirc.mark_discard(copies).then(service.refresh);
     }
 
     service.mark_missing = function(items) {
         var copies = items
             .filter(function(item) { return Boolean(item.copy) })
-            .map(function(item) { return item.copy });
-        if (copies.length) 
+            .map(function(item) {
+                return
+                {
+                    id : item.copy.id(),
+                    barcode : item.copy.barcode()
+                };
+            });
+        if (copies.length)
             egCirc.mark_missing(copies).then(service.refresh);
     }
 
     service.mark_missing_wide = function(items) {
-        var copy_ids = items
+        var copies = items
+            .filter(function(item) { return Boolean(item.hold.cp_id) })
+            .map(function(item) { return {id : item.hold.cp_id, barcode : item.hold.cp_barcode}; });
+        if (copies.length)
+            egCirc.mark_missing(copies).then(service.refresh);
+    }
+
+    service.mark_discard_wide = function(items) {
+        var copies = items
             .filter(function(item) { return Boolean(item.hold.cp_id) })
-            .map(function(item) { return item.hold.cp_id });
-        if (copy_ids.length) 
-            egCirc.mark_missing(copy_ids).then(service.refresh);
+            .map(function(item) { return {id : item.hold.cp_id, barcode : item.hold.cp_barcode}; });
+        if (copies.length)
+            egCirc.mark_discard(copies).then(service.refresh);
     }
 
     service.retarget = function(items) {
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 3326198dc3..ad04becd26 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -645,13 +645,13 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
     }
 
     service.selectedHoldingsDiscard = function (items) {
-        egCirc.mark_discard(items).then(function(){
+        egCirc.mark_discard(items.map(function(el){return {id : el.id, barcode : el.barcode};}).then(function(){
             angular.forEach(items, function(cp){service.add_barcode_to_list(cp.barcode)});
         });
     }
 
     service.selectedHoldingsMissing = function (items) {
-        egCirc.mark_missing(items).then(function(){
+        egCirc.mark_missing(items.map(function(el){return {id : el.id, barcode : el.barcode};}).then(function(){
             angular.forEach(items, function(cp){service.add_barcode_to_list(cp.barcode)});
         });
     }