From a512db4dfd7752a5503e8138fbb7f510705b69c5 Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Sun, 21 Oct 2018 07:55:23 -0400 Subject: [PATCH] Trying pcrud search and deferred.notify(). --- .../web/js/ui/default/staff/circ/services/circ.js | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) 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 c9985e3725..212e1a6e13 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 @@ -1414,23 +1414,35 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl function get_status(id) { var deferred = $q.defer() - egCore.pcrud.retrieve('ccs', id, {atomic: true}) + egCore.pcrud.search('ccs', ids) .then(function(resp) { - deferred.resolve(resp) + deferred.resolve(resp); + }, function(resp) { + deferred.reject(resp); + }, function(resp) { + deferred.notify(resp); }); return deferred.promise; } - var promise = get_status(markstatus); - return promise.then(function(newStatus) { + var newStatus, oldStatus; + var promise = get_status([markstatus,copy['status.id']]); + return promise.then(function(resp) { return egConfirmDialog.open( - 'Status', - newStatus.name(), + 'Mark Item ' + newStatus.name(), + 'From ' + oldStatus.name(), { ok : function() {}, cancel : function() {} } ).result; + }, function(resp) { + /* noop */ + }, function(resp) { + if (resp.id() == markstatus) + newStatus = resp; + else + olStatus = resp; }); } -- 2.11.0