fixed logic bug in non-idlist version
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 9 Jan 2009 21:49:55 +0000 (21:49 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 9 Jan 2009 21:49:55 +0000 (21:49 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@11790 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/web/js/dojo/openils/User.js

index 3caba26..1c8e34d 100644 (file)
@@ -184,20 +184,22 @@ if(!dojo._hasResource["openils.User"]) {
         getPermOrgList : function(permList, onload, includeDescendents, idlist) {
             if(typeof permList == 'string') permList = [permList];
 
+            console.log('loading org perms ' + permList + ' for user ' + this.user.id());
             var oncomplete = function(r) {
                 var permMap = openils.Util.readResponse(r);
                 var orgList = [];
                 for(var perm in permMap) {
                     var permOrgList = permMap[perm];
-                    if(includeDescendents) {
-                        for(var i in permOrgList) {
+                    for(var i in permOrgList) {
+                        if(includeDescendents) {
                             orgList = orgList.concat(
                                 fieldmapper.aou.descendantNodeList(permOrgList[i]));
+                        } else {
+                            orgList = orgList.concat(fieldmapper.aou.findOrgUnit(permOrgList[i]));
                         }
-                    } else {
-                        orgList = orgList.concat(permOrgList);
                     }
                 }
+
                 // remove duplicates
                 var trimmed = [];
                 for(var idx in orgList) {