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

more consistency on user groupings ('all users', etc)

Browse Source
This commit is contained in:
Jay Lee
2014-11-19 10:06:32 -05:00
parent 05f5ed338b
commit d806d55a64
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gam.py
View File

@ -40,10 +40,14 @@ import oauth2client.file
import oauth2client.tools import oauth2client.tools
import uritemplate import uritemplate
global true_values, false_values, prettyPrint, customerId, domain global true_values, false_values, prettyPrint, customerId, domain, usergroup_types
true_values = [u'on', u'yes', u'enabled', u'true', u'1'] true_values = [u'on', u'yes', u'enabled', u'true', u'1']
false_values = [u'off', u'no', u'disabled', u'false', u'0'] false_values = [u'off', u'no', u'disabled', u'false', u'0']
usergroup_types = [u'user', u'users', u'group', u'ou', u'org',
u'ou_and_children', u'ou_and_child', u'query',
u'license', u'licenses', u'file', u'all',
u'cros']
def convertUTF8(data): def convertUTF8(data):
import collections import collections
if isinstance(data, str): if isinstance(data, str):
@ -4288,7 +4292,7 @@ def doUpdateGroup():
if role not in [u'OWNER', u'MANAGER', u'MEMBER']: if role not in [u'OWNER', u'MANAGER', u'MEMBER']:
role = u'MEMBER' role = u'MEMBER'
i = 5 i = 5
if sys.argv[i].lower() in [u'user', u'users', u'group', u'ou', u'org', u'query', u'file', u'all']: if sys.argv[i].lower() in usergroup_types:
users_email = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1]) users_email = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1])
else: else:
users_email = [sys.argv[i],] users_email = [sys.argv[i],]
@ -4337,7 +4341,7 @@ def doUpdateGroup():
i = 5 i = 5
if sys.argv[i].lower() in [u'member', u'manager', u'owner']: if sys.argv[i].lower() in [u'member', u'manager', u'owner']:
i += 1 i += 1
if sys.argv[i].lower() in [u'user', u'users', u'group', u'ou', u'org', u'query', u'file', u'all']: if sys.argv[i].lower() in usergroup_types:
user_emails = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1]) user_emails = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1])
else: else:
user_emails = [sys.argv[i],] user_emails = [sys.argv[i],]
@ -4559,7 +4563,7 @@ def doUpdateOrg():
orgUnitPath = sys.argv[3] orgUnitPath = sys.argv[3]
cd = buildGAPIObject(u'directory') cd = buildGAPIObject(u'directory')
if sys.argv[4].lower() in [u'move', u'add']: if sys.argv[4].lower() in [u'move', u'add']:
if sys.argv[5].lower() in [u'user', u'users', u'cros', u'group', u'ou', u'org', u'query', u'file', u'all']: if sys.argv[5].lower() in usergroup_types:
users = getUsersToModify(entity_type=sys.argv[5], entity=sys.argv[6]) users = getUsersToModify(entity_type=sys.argv[5], entity=sys.argv[6])
else: else:
users = getUsersToModify(entity_type=u'user', entity=sys.argv[5]) users = getUsersToModify(entity_type=u'user', entity=sys.argv[5])
@ -6409,7 +6413,7 @@ def doPrintTokens():
if sys.argv[i].lower() == u'todrive': if sys.argv[i].lower() == u'todrive':
todrive = True todrive = True
i += 1 i += 1
elif sys.argv[i].lower() in [u'user', u'users', u'group', u'ou', u'org', u'query', u'file', u'all']: elif sys.argv[i].lower() in usergroup_types:
entity_type = sys.argv[i].lower() entity_type = sys.argv[i].lower()
entity = sys.argv[i+1].lower() entity = sys.argv[i+1].lower()
i += 2 i += 2