"bifurcate"

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

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
index c292a55..3bf117e 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
@@ -47,9 +47,9 @@
                                if (g.cgi.param('copy_ids')) copy_ids = copy_ids.concat( JSON2js( g.cgi.param('copy_ids') ) );
                                if (typeof window.xuLG == 'object' && typeof window.xulG.copy_ids != 'undefined')
                                        copy_ids = copy_ids.concat( window.xulG.copy_ids );
-                               if (typeof g.data.temp_copy_ids != 'undefined' && g.data.temp_copy_ids != null) {
-                                       copy_ids = copy_ids.concat( JSON2js( g.data.temp_copy_ids ) );
-                                       g.data.temp_copy_ids = undefined; g.data.stash('temp_copy_ids');
+                               if (typeof g.data.cb_temp_copy_ids != 'undefined' && g.data.cb_temp_copy_ids != null) {
+                                       copy_ids = copy_ids.concat( JSON2js( g.data.cb_temp_copy_ids ) );
+                                       g.data.cb_temp_copy_ids = undefined; g.data.stash('cb_temp_copy_ids');
                                }
 
                                JSAN.use('cat.copy_buckets'); g.copy_buckets = new cat.copy_buckets();

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
index e4a9541..80a0065 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
@@ -50,9 +50,9 @@
                                if (g.cgi.param('copy_ids')) g.copy_ids = g.copy_ids.concat( JSON2js( g.cgi.param('copy_ids') ) );
                                if (typeof window.xuLG == 'object' && typeof window.xulG.copy_ids != 'undefined')
                                        g.copy_ids = g.copy_ids.concat( window.xulG.copy_ids );
-                               if (typeof g.data.temp_copy_ids != 'undefined' && g.data.temp_copy_ids != null) {
-                                       g.copy_ids = g.copy_ids.concat( JSON2js( g.data.temp_copy_ids ) );
-                                       g.data.temp_copy_ids = undefined; g.data.stash('temp_copy_ids');
+                               if (typeof g.data.cb_temp_copy_ids != 'undefined' && g.data.cb_temp_copy_ids != null) {
+                                       g.copy_ids = g.copy_ids.concat( JSON2js( g.data.cb_temp_copy_ids ) );
+                                       g.data.cb_temp_copy_ids = undefined; g.data.stash('cb_temp_copy_ids');
                                }
 
                                $('desc').appendChild( document.createTextNode( 
@@ -126,7 +126,7 @@
 
                g.advanced = function() {
                        JSAN.use('util.window'); var win = new util.window();
-                       g.data.temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('temp_copy_ids');
+                       g.data.cb_temp_copy_ids = js2JSON( g.copy_ids ); g.data.stash('cb_temp_copy_ids');
                        win.open(urls.XUL_COPY_BUCKETS,'adv_copy_buckets','chrome,resizable,modal');
                        window.close();
                }

diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index fcd1048..3ef3b48 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -58,7 +58,7 @@ cat.util.add_copies_to_bucket = function(selection_list) {
        JSAN.use('util.functional');
        JSAN.use('util.window'); var win = new util.window();
        JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
-       data.temp_copy_ids = js2JSON(
+       data.cb_temp_copy_ids = js2JSON(
                util.functional.map_list(
                        selection_list,
                        function (o) {
@@ -70,7 +70,7 @@ cat.util.add_copies_to_bucket = function(selection_list) {
                        }
                )
        );
-       data.stash('temp_copy_ids');
+       data.stash('cb_temp_copy_ids');
        win.open( 
                xulG.url_prefix(urls.XUL_COPY_BUCKETS_QUICK),
                'sel_bucket_win' + win.window_name_increment(),