fix Cancel button in volume editor

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2_3@10314 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 b79e29f..5196d9c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -515,11 +515,12 @@ cat.copy_browser.prototype = {
                                                                                window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
                                                                                title,
                                                                                'chrome,modal,resizable',
-                                                                               { 'volumes' : list }
+                                                                               { 'volumes' : JSON2js(js2JSON(list)) }
                                                                        );
 
                                                                        /* FIXME -- need to unique the temp space, and not rely on modalness of window */
                                                                        //obj.data.stash_retrieve();
+                                    if (typeof my_xulG.update_these_volumes == 'undefined') return;
                                                                        var volumes = my_xulG.volumes;
                                                                        if (!volumes) return;
                                                                

diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
index 4e4bafd..03f1b77 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -87,6 +87,7 @@
                                //g.error.sdump('D_CAT','in modal window, g.data.volumes_temp = \n' + g.data.volumes_temp + '\n');
                                //g.data.stash('volumes_temp');
                                xulG.volumes = g.volumes;
+                xulG.update_these_volumes = 1;
                                update_modal_xulG(xulG);
                                window.close();
                        } catch(E) {

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 1038e82..b84d2ff 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -641,12 +641,13 @@ circ.copy_status.prototype = {
                                                                                window.xulG.url_prefix(urls.XUL_VOLUME_EDITOR),
                                                                                title,
                                                                                'chrome,modal,resizable',
-                                                                               { 'volumes' : list }
+                                                                               { 'volumes' : JSON2js(js2JSON(list)) }
                                                                        );
 
                                                                        /* FIXME -- need to unique the temp space, and not rely on modalness of window */
                                                                        //obj.data.stash_retrieve();
                                                                        //var volumes = JSON2js( obj.data.volumes_temp );
+                                    if (typeof my_xulG.update_these_volumes == 'undefined') return;
                                                                        var volumes = my_xulG.volumes;
                                                                        if (!volumes) return;