From 1d19ff6b99bbf4067e80bc910af25c41a696c588 Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Sun, 21 Oct 2018 12:32:16 -0400
Subject: [PATCH] Bring initial confirmation dialog.

Also edit the strings a bit.
---
 .../src/templates/staff/circ/share/circ_strings.tt2     | 11 ++++++-----
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js  | 17 +++++++++++++++--
 Open-ILS/web/js/ui/default/staff/circ/services/item.js  |  7 ++-----
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
index 8983ce08d1..d760d642e1 100644
--- a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
@@ -27,11 +27,12 @@ s.LOCATION_ALERT_MSG =
     "{{copy.barcode()}}","{{copy.location().name()}}") %]';
 s.MARK_DAMAGED_CONFIRM = '[% l("Mark {{num_items}} items as DAMAGED?") %]';
 s.MARK_MISSING_CONFIRM = '[% l("Mark {{num_items}} items as MISSING?") %]';
-s.MARK_ITEM_CHECKED_OUT = '[% l("Item to mark {{status}} is checked out.") %]';
-s.MARK_ITEM_IN_TRANSIT = '[% l("Item to mark {{status}} is in transit.") %]';
-s.MARK_ITEM_RESTRICT_DELETE = '[% l("Item to mark {{status}} is in a status with a copy delete warning.") %]';
-s.MARK_ITEM_LAST_HOLD_COPY = '[% l("Item to mark {{status}} is the last item to fill a hold.") %]';
-s.MARK_ITEM_CONTINUE = '[% l("Do you wish to continue?") %]';
+s.MARK_DISCARD_CONFIRM = '[% l("Mark {{num_items}} items as DICARD/WEED?") %]';
+s.MARK_ITEM_CHECKED_OUT = '[% l("Item {{barcode}} is checked out.") %]';
+s.MARK_ITEM_IN_TRANSIT = '[% l("Item {{barcode}} is in transit.") %]';
+s.MARK_ITEM_RESTRICT_DELETE = '[% l("Item {{barcode}} is in a status with a copy delete warning.") %]';
+s.MARK_ITEM_LAST_HOLD_COPY = '[% l("Item {{barcode}} is the last item to fill a hold.") %]';
+s.MARK_ITEM_CONTINUE = '[% l("Do you wish to continue marking it {{status}}?") %]';
 s.ABORT_TRANSIT_CONFIRM = '[% l("Cancel {{num_transits}} transits?") %]';
 s.ROUTE_TO_HOLDS_SHELF = '[% l("Holds Shelf") %]';
 s.ROUTE_TO_CATALOGING = '[% l("Cataloging") %]';
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index a953026639..ae732b14f4 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1445,8 +1445,21 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
         });
     }
 
-    service.mark_discard = function(copy) {
-        return service.mark_item(copy, 13, {});
+    service.mark_discard = function(copies) {
+        return egConfirmDialog.open(
+            egCore.strings.MARK_DISCARD_CONFIRM, '',
+            {
+                num_items : copies.length,
+                ok : function() {},
+                cancel : function() {}
+            }
+        ).then(function() {
+            var promises = [];
+            angular.forEach(copies, function(copy) {
+                promises.push(service.mark_item(copy, 13, {}))
+            });
+        });
+        return $q.all(promises);
     }
 
     service.mark_missing = function(copy_ids) {
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 535c59250c..478dbd6e07 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,11 +645,8 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
     }
 
     service.selectedHoldingsDiscard = function (items) {
-        angular.forEach(items, function(cp) {
-            if (cp) {
-                egCirc.mark_discard(cp).then(function(){
-                    service.add_barcode_to_list(cp.barcode)});
-            }
+        egCirc.mark_discard(items).thef(function(){
+            angular.forEach(items, function(cp){service.add_barcode_to_list(cp.barcode)});
         });
     }
 
-- 
2.11.0