handle some exceptions during volume/copy transfer, and for copy transfer, set the...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5393 dcc99617-32d9-48b4-a31d-7c20da2025e4

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 f09bdb5..ae20f55 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -645,13 +645,18 @@ cat.copy_browser.prototype = {
                                                                                {
                                                                                        'title' : 'Override Volume Transfer Failure?',
                                                                                        'overridable_events' : [
+                                                                                               1208 /* TITLE_LAST_COPY */,
                                                                                                1219 /* COPY_REMOTE_CIRC_LIB */,
                                                                                        ],
                                                                                }
                                                                        );
 
                                                                        if (typeof robj.ilsevent != 'undefined') {
-                                                                               throw(robj);
+                                                                               if (robj.ilsevent == 1221 /* ORG_CANNOT_HAVE_VOLS */) {
+                                                                                       alert('That destination cannot have volumes.');
+                                                                               } else {
+                                                                                       throw(robj);
+                                                                               }
                                                                        } else {
                                                                                alert('Volumes transferred.');
                                                                        }

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index b7adc33..bf55561 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -47,10 +47,18 @@ cat.util.transfer_copies = function(params) {
 
                for (var i = 0; i < copies.length; i++) {
                        copies[i].call_number( data.marked_volume );
+                       copies[i].circ_lib( params.owning_lib );
                        copies[i].ischanged( 1 );
                }
 
-               var robj = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), copies, true ]);
+               var robj = network.simple_request('FM_ACP_FLESHED_BATCH_UPDATE', [ ses(), copies, true ], null
+                       {
+                               'title' : 'Override Transfer Failure?',
+                               'overridable_events' : [
+                                       1208 /* TITLE_LAST_COPY */,
+                               ]
+                       }
+               );
                
                if (typeof robj.ilsevent != 'undefined') {
                        throw(robj);