From: Jason Stephenson Date: Tue, 22 Nov 2011 15:17:49 +0000 (-0500) Subject: Put up an alert for COPY_DELETE_WARNING instead of an unhandled error. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fdyrcona%2Flp857401;p=working%2FEvergreen.git Put up an alert for COPY_DELETE_WARNING instead of an unhandled error. Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js index d234f37ba3..0f83588767 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js @@ -545,13 +545,20 @@ cat.copy_browser.prototype = { 'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.override'), 'overridable_events' : [ 1208 /* TITLE_LAST_COPY */, - 1227 /* COPY_DELETE_WARNING */, ] } ); if (robj == null) throw(robj); if (typeof robj.ilsevent != 'undefined') { - if ( (robj.ilsevent != 0) && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */) && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */) ) throw(robj); + switch (robj.ilsevent) { + case 1208: /* TITLE_LAST_COPY */ + break; + case 1227: /* COPY_DELETE_WARNING */ + alert(robj.desc); + break; + default: + throw(robj); + } } obj.refresh_list(); } diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js index e3bba6a54d..ff5f75320e 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_status.js +++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js @@ -626,6 +626,9 @@ circ.copy_status.prototype = { switch(Number(robj.ilsevent)) { case 1208 /* TITLE_LAST_COPY */: break; + case 1227: /* COPY_DELETE_WARNING */ + alert(robj.desc); + break; default: obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success.error'), robj); break; diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.js b/Open-ILS/xul/staff_client/server/serial/manage_items.js index 640ac4e271..6a242aa660 100644 --- a/Open-ILS/xul/staff_client/server/serial/manage_items.js +++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js @@ -288,7 +288,17 @@ serial.manage_items.prototype = { ); if (robj == null) throw(robj); if (typeof robj.ilsevent != 'undefined') { - if ( (robj.ilsevent != 0) && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */) ) throw(robj); + if ( (robj.ilsevent != 0) ) { + switch (robj.ilsevent) { + case 1208: /* TITLE_LAST_COPY */ + break; + case 1227: /* COPY_DELETE_WARNING */ + alert(robj.desc); + break; + default: + throw(robj); + } + } } obj.refresh_list(obj.selected_list); }