From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 16 Nov 2010 20:11:52 +0000 (+0000)
Subject: backport r18757 from trunk for opac org hiding extension to place hold pickup lib... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ddaa95ffa9fac06bdc4059f8f0814ee7d5602022;p=working%2FEvergreen.git

backport r18757 from trunk for opac org hiding extension to place hold pickup lib menu

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

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 6f3120b4a0..478b80e410 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -664,17 +664,31 @@ function holdsCheckPossibility(pickuplib, hold, recurse) {
 function holdsBuildOrgSelector(node) {
 
 	if(!node) node = globalOrgTree;
-    if(!isTrue(node.opac_visible())) return;
+	if(!isTrue(node.opac_visible())) return;
 
-	var selector = $('holds_org_selector');
-	var index = selector.options.length;
+	var render_this_org = true;
+	var orgHiding = checkOrgHiding(); // value here is cached so not too painful with the recursion
+	if (orgHiding) {
+		if (node.id() == globalOrgTree.id()) {
+			node = orgHiding.org; // top of tree = org hiding context org
+		}
+		if ( ! orgIsMine( orgHiding.org, node, orgHiding.depth ) ) {
+			render_this_org = false;
+		}
+	}
 
-	var type = findOrgType(node.ou_type());
-	var indent = type.depth() - 1;
-	var opt = setSelectorVal( selector, index, node.name(), node.id(), null, indent );
-	if(!type.can_have_users()) {
-		opt.disabled = true;
-		addCSSClass(opt, 'disabled_option');
+	if (render_this_org) {
+		var selector = $('holds_org_selector');
+		var index = selector.options.length;
+
+		var type = findOrgType(node.ou_type());
+		var indent = type.depth() - 1;
+
+		var opt = setSelectorVal( selector, index, node.name(), node.id(), null, indent );
+		if(!type.can_have_users()) {
+			opt.disabled = true;
+			addCSSClass(opt, 'disabled_option');
+		}
 	}
 	
 	for( var i in node.children() ) {