[open-ils-commits] r10315 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/cat xul/staff_client/server/circ

[svn at svn.open-ils.org]

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

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js
   trunk/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
   trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
Log:
fix Cancel button in volume editor

Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-08-08 15:37:13 UTC (rev 10314)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-08-08 15:37:24 UTC (rev 10315)
@@ -2027,6 +2027,7 @@
 <!ENTITY staff.cat.volume_copy_creator.num_of_volumes_label.value "# of volumes">
 <!ENTITY staff.cat.volume_editor.caption.label "Volume Editor">
 <!ENTITY staff.cat.volume_editor.modify.label "Modify">
+<!ENTITY staff.cat.volume_editor.cancel.label "Cancel">
 <!ENTITY staff.cat.z3950.marc_import.label "MARC Import via Z39.50">
 <!ENTITY staff.cat.z3950.marc_import.accesskey "I">
 <!ENTITY staff.cat.z3950.service_credentials.label "Service and Credentials">

Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-08-08 15:37:13 UTC (rev 10314)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-08-08 15:37:24 UTC (rev 10315)
@@ -536,11 +536,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: trunk/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/volume_editor.xul	2008-08-08 15:37:13 UTC (rev 10314)
+++ trunk/Open-ILS/xul/staff_client/server/cat/volume_editor.xul	2008-08-08 15:37:24 UTC (rev 10315)
@@ -86,6 +86,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) {
@@ -103,7 +104,7 @@
 	<groupbox flex="1" style="overflow: auto">
 		<caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
 		<hbox>
-			<button label="Cancel" oncommand="window.close();"/>
+			<button label="&staff.cat.volume_editor.cancel.label;" oncommand="window.close();"/>
 			<spacer flex="1" />
 			<button label="&staff.cat.volume_editor.modify.label;" oncommand="g.stash_and_close();"/>
 		</hbox>

Modified: trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js	2008-08-08 15:37:13 UTC (rev 10314)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js	2008-08-08 15:37:24 UTC (rev 10315)
@@ -666,12 +666,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; }