[open-ils-commits] r9247 - in trunk/Open-ILS/xul/staff_client: chrome/content/OpenILS server/circ

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-04-07 12:27:53 -0400 (Mon, 07 Apr 2008)
New Revision: 9247

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
   trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
   trunk/Open-ILS/xul/staff_client/server/circ/in_house_use.js
Log:
prevent the viewing of foreign non-cats from polluting local non-cat dropdown lists

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2008-04-07 14:59:04 UTC (rev 9246)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2008-04-07 16:27:53 UTC (rev 9247)
@@ -704,6 +704,28 @@
 		this.chain.push(
 			function() {
 				var f = gen_fm_retrieval_func(
+					'my_cnct',
+					[
+						api.FM_CNCT_RETRIEVE.app,
+						api.FM_CNCT_RETRIEVE.method,
+						[ obj.list.au[0].ws_ou() ], 
+						false
+					]
+				);
+				try {
+					f();
+				} catch(E) {
+					var error = 'Error: ' + js2JSON(E);
+					obj.error.sdump('D_ERROR',error);
+					throw(E);
+				}
+			}
+		);
+
+
+		this.chain.push(
+			function() {
+				var f = gen_fm_retrieval_func(
 					'acpl',
 					[
 						api.FM_ACPL_RETRIEVE.app,

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-04-07 14:59:04 UTC (rev 9246)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-04-07 16:27:53 UTC (rev 9247)
@@ -55,7 +55,7 @@
 								var items = [ [ document.getElementById('circStrings').getString('staff.circ.checkout.barcode') , 'barcode' ] ].concat(
 									util.functional.map_list(
 										util.functional.filter_list(
-											obj.data.list.cnct,
+											obj.data.list.my_cnct,
 											function(o) {
 												return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
 											}

Modified: trunk/Open-ILS/xul/staff_client/server/circ/in_house_use.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/in_house_use.js	2008-04-07 14:59:04 UTC (rev 9246)
+++ trunk/Open-ILS/xul/staff_client/server/circ/in_house_use.js	2008-04-07 16:27:53 UTC (rev 9247)
@@ -58,7 +58,7 @@
 								var items = [ [ document.getElementById('circStrings').getString('staff.circ.in_house_use.barcode') , 'barcode' ] ].concat(
 									util.functional.map_list(
 										util.functional.filter_list(
-											obj.data.list.cnct,
+											obj.data.list.my_cnct,
 											function(o) {
 												return util.fm_utils.compare_aou_a_is_b_or_ancestor(o.owning_lib(), obj.data.list.au[0].ws_ou());
 											}