Put up an alert for COPY_DELETE_WARNING instead of an unhandled error.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>

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 d234f37..0f83588 100644 (file)
--- 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 e3bba6a..ff5f753 100644 (file)
--- 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 640ac4e..6a242aa 100644 (file)
--- 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);
                                 }