hiding non-opac_visible orgs in public opac

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

diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index ca49b74..1a1f439 100644 (file)
--- a/Open-ILS/web/opac/common/js/opac_utils.js
+++ b/Open-ILS/web/opac/common/js/opac_utils.js
@@ -739,6 +739,7 @@ function buildOrgSelector(node) {
        for( var i in orgArraySearcher ) { 
                var node = orgArraySearcher[i];
                if( node == null ) continue;
+        if(!isXUL() && !isTrue(node.opac_visible())) continue; 
                if(node.parent_ou() == null)
                        tree.addNode(node.id(), -1, node.name(), 
                                "javascript:orgSelect(" + node.id() + ");", node.name());
@@ -765,7 +766,6 @@ function setFontSize(size) {
        cookieManager.write(COOKIE_FONT, size, '+1y');
 }
 
-
 var resourceFormats = [
    "text",
    "moving image",

diff --git a/Open-ILS/web/opac/common/js/org_utils.js b/Open-ILS/web/opac/common/js/org_utils.js
index f86afca..fd45f41 100644 (file)
--- a/Open-ILS/web/opac/common/js/org_utils.js
+++ b/Open-ILS/web/opac/common/js/org_utils.js
@@ -85,6 +85,7 @@ for (var i in _l) {
        x.ou_type(_l[i][1]);
        x.parent_ou(_l[i][2]);
        x.name(_l[i][3]);
+    x.opac_visible(_l[i][4]);
        orgArraySearcher[x.id()] = x;
 }
 for (var i in orgArraySearcher) {

diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js
index 57b774b..066d3fd 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/rdetail.js
+++ b/Open-ILS/web/opac/skin/default/js/rdetail.js
@@ -504,9 +504,12 @@ function _rdetailRows(node) {
                } 
        }
 
+    /* don't show hidden orgs */
 
        if(node) {
 
+        if(!isXUL() && !isTrue(node.opac_visible())) return;
+
                var row = copyRow.cloneNode(true);
                row.id = "cp_info_" + node.id();