[open-ils-commits] r10313 - in branches/rel_1_2/Open-ILS/xul/staff_client/server: cat circ

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-08-08 11:37:03 -0400 (Fri, 08 Aug 2008)
New Revision: 10313

Modified:
   branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js
   branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
   branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/copy_status.js
Log:
fix Cancel button in volume editor

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-08-08 14:40:03 UTC (rev 10312)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-08-08 15:37:03 UTC (rev 10313)
@@ -515,11 +515,12 @@
 										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;
 								

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/volume_editor.xul	2008-08-08 14:40:03 UTC (rev 10312)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/server/cat/volume_editor.xul	2008-08-08 15:37:03 UTC (rev 10313)
@@ -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) {

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/copy_status.js
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/copy_status.js	2008-08-08 14:40:03 UTC (rev 10312)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/copy_status.js	2008-08-08 15:37:03 UTC (rev 10313)
@@ -641,12 +641,13 @@
 										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;