From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 8 Aug 2008 15:37:24 +0000 (+0000)
Subject: fix Cancel button in volume editor
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9c1fbaebb0c0ea8700c431c793c44a4d68a18f3e;p=Evergreen.git

fix Cancel button in volume editor

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

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 8ba6519715..3ebd54f8e7 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -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">
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 6e307615c4..28f17f4326 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -536,11 +536,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 3488512f07..6784e39325 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -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>
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 79dd8c6105..f549818f13 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -666,12 +666,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; }