deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 14:13:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Make code in orgUnitPathQuery more readable (#512)

Browse Source
This commit is contained in:
Ross Scroggs
2017-06-21 11:20:44 -07:00
committed by Jay Lee
parent 720bd46683
commit 21c2ecfd1d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gam.py
View File

@ -8454,6 +8454,11 @@ def doGetNotifications():
print u'--------------' print u'--------------'
print u'' print u''
def orgUnitPathQuery(path):
if path != u'/':
return u"orgUnitPath='{0}'".format(path.replace(u"'", u"\'"))
return None
def doGetOrgInfo(): def doGetOrgInfo():
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
name = sys.argv[3] name = sys.argv[3]
@ -8484,7 +8489,7 @@ def doGetOrgInfo():
print u'Users: ' print u'Users: '
page_message = u'Got %%total_items%% users: %%first_item%% - %%last_item%%\n' page_message = u'Got %%total_items%% users: %%first_item%% - %%last_item%%\n'
users = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message, users = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message,
message_attribute=u'primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=u"orgUnitPath='%s'" % name, message_attribute=u'primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=orgUnitPathQuery(name),
fields=u'users(primaryEmail,orgUnitPath),nextPageToken', maxResults=GC_Values[GC_USER_MAX_RESULTS]) fields=u'users(primaryEmail,orgUnitPath),nextPageToken', maxResults=GC_Values[GC_USER_MAX_RESULTS])
for user in users: for user in users:
if show_children or (name.lower() == user[u'orgUnitPath'].lower()): if show_children or (name.lower() == user[u'orgUnitPath'].lower()):
@ -10050,7 +10055,7 @@ def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=No
page_message = u'Got %%total_items%% users..' page_message = u'Got %%total_items%% users..'
members = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message, members = callGAPIpages(cd.users(), u'list', u'users', page_message=page_message,
customer=GC_Values[GC_CUSTOMER_ID], fields=u'nextPageToken,users(primaryEmail,suspended)', customer=GC_Values[GC_CUSTOMER_ID], fields=u'nextPageToken,users(primaryEmail,suspended)',
query=u"orgUnitPath='%s'" % ou, maxResults=GC_Values[GC_USER_MAX_RESULTS]) query=orgUnitPathQuery(ou), maxResults=GC_Values[GC_USER_MAX_RESULTS])
for member in members: for member in members:
if not checkNotSuspended or not member[u'suspended']: if not checkNotSuspended or not member[u'suspended']:
users.append(member[u'primaryEmail']) users.append(member[u'primaryEmail'])