prevent the viewing of foreign non-cats from polluting local non-cat dropdown lists

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

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
index bed7aa7..4565aba 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
@@ -704,6 +704,28 @@ OpenILS.data.prototype = {
                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,

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 6df2f82..6f21e3e 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -55,7 +55,7 @@ circ.checkout.prototype = {
                                                                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());
                                                                                        }

diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.js b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
index b369d02..da0e6b4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.js
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
@@ -58,7 +58,7 @@ circ.in_house_use.prototype = {
                                                                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());
                                                                                        }