From: erickson Date: Fri, 9 Jan 2009 21:49:55 +0000 (+0000) Subject: fixed logic bug in non-idlist version X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d3f83ab48ed48227d1d8e5e795ce4f2916a6b069;p=Evergreen.git fixed logic bug in non-idlist version git-svn-id: svn://svn.open-ils.org/ILS/trunk@11790 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js index 3caba263c2..1c8e34d697 100644 --- a/Open-ILS/web/js/dojo/openils/User.js +++ b/Open-ILS/web/js/dojo/openils/User.js @@ -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) {