deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 18:01:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

In gam print admins, include id: with orgUnitId in CSV file

Browse Source
This commit is contained in:
Ross Scroggs
2016-01-12 07:27:31 -08:00
parent 671f7d810c
commit 16d8cddf12
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gam.py
View File

@@ -1665,7 +1665,6 @@ def doPrintAdmins():
continue
if key not in admins_attrib[0]:
admins_attrib[0][key] = key
admin_attrib[key] = value
if key == u'assignedTo':
assignedToUser = user_from_userid(value)
if u'assignedToUser' not in admins_attrib[0]:
@@ -1677,10 +1676,12 @@ def doPrintAdmins():
admins_attrib[0][u'role'] = u'role'
admin_attrib[u'role'] = role
elif key == u'orgUnitId':
value = u'id:%s' % value
orgUnit = orgunit_from_orgunitid(value)
if u'orgUnit' not in admins_attrib[0]:
admins_attrib[0][u'orgUnit'] = u'orgUnit'
admin_attrib[u'orgUnit'] = orgUnit
admin_attrib[key] = value
admins_attrib.append(admin_attrib)
output_csv(admins_attrib, admins_attrib[0], u'Admins', todrive)
@@ -1696,7 +1697,7 @@ def buildOrgUnitIdToNameMap():
def orgunit_from_orgunitid(orgunitid):
if not GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME]:
buildOrgUnitIdToNameMap()
return GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][u'id:%s' % orgunitid]
return GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][orgunitid]
def buildRoleIdToNameToIdMap():
cd = buildGAPIObject(u'directory')