default pickup_lib is now set to 'origloc' (the original location for the opac)

and fails over to user home_ou of origloc is not valid

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4836 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 604635f..fa87acf 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -279,6 +279,16 @@ function __holdsDrawWindow() {
        if(!holdsOrgSelectorBuilt) {
                holdsBuildOrgSelector(null,0);
                holdsOrgSelectorBuilt = true;
+
+               var selector = $('holds_org_selector');
+               var o_loc = findOrgUnit(getOrigLocation());
+               var t = findOrgType(o_loc.ou_type());
+
+               if( t.can_have_users() ) 
+                       setSelector(selector, o_loc.id());
+               else 
+                       setSelector(selector, holdArgs.recipient.home_ou());
+       
        }
 
        if(isXUL()) {
@@ -537,11 +547,6 @@ function holdsBuildOrgSelector(node) {
                addCSSClass(opt, 'disabled_option');
        }
        
-       if( node.id() == holdArgs.recipient.home_ou() ) {
-               selector.selectedIndex = index;
-               selector.options[index].selected = true;        
-       }
-
        for( var i in node.children() ) {
                var child = node.children()[i];
                if(child) holdsBuildOrgSelector(child);