From 2cc54ee093831c34706cd1435cb6d6c106d1ee40 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Fri, 8 Apr 2016 13:21:38 -0400 Subject: [PATCH] Fleshed call does not find "odd" circs, fetch directly; Disable auto-overrides on existing circ to allow alerts to show up Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Conflicts: Open-ILS/web/js/ui/default/staff/circ/services/circ.js TODO: Verify that the resolution of the merge conflict doesn't cause a regression on LP#1522635 Signed-off-by: Galen Charlton --- .../web/js/ui/default/staff/circ/services/circ.js | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 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 9d4767f26f..d92ce56573 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 @@ -942,12 +942,24 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl if (angular.isArray(evt)) evt = evt[0]; if (!evt.payload.old_circ) { - return egCore.pcrud.search('circ', - {target_copy : evt.payload.copy.id(), checkin_time : null}, - {limit : 1} // should only ever be 1 - ).then(function(old_circ) { - evt.payload.old_circ = old_circ; - return service.circ_exists_dialog_impl(evt, params, options); + return egCore.net.request( + 'open-ils.search', + 'open-ils.search.asset.copy.fleshed2.find_by_barcode', + params.copy_barcode + ).then(function(resp){ + console.log(resp); + if (egCore.evt.parse(resp)) { + console.error(egCore.evt.parse(resp)); + } else { + return egCore.net.request( + 'open-ils.circ', + 'open-ils.circ.copy_checkout_history.retrieve', + egCore.auth.token(), resp.id(), 1 + ).then( function (circs) { + evt.payload.old_circ = circs[0]; + return service.circ_exists_dialog_impl( evt, params, options ); + ); + } }); } else { return service.circ_exists_dialog_impl( evt, params, options ); @@ -978,14 +990,12 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog, egAddCopyAl function(args) { if (sameUser) { params.void_overdues = args.forgive_fines; - options.override = true; return service.renew(params, options); } return service.checkin({ barcode : params.copy_barcode, noop : true, - override : true, void_overdues : args.forgive_fines }).then(function(checkin_resp) { if (checkin_resp.evt[0].textcode == 'SUCCESS') { -- 2.11.0