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

Guardian command cleanup

Browse Source 
Upshift states list as a convenience to user; split on comma or space
as in most other lists
Tell user about invalid argument
Keep pylint happy, eliminate extra spaces
This commit is contained in:
Ross Scroggs
2016-08-21 10:47:57 -07:00
parent aa48edc0ff
commit 3b5b5be881
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gam.py
View File

@@ -2315,11 +2315,14 @@ def doPrintGuardians():
states = [u'COMPLETE', u'PENDING', u'GUARDIAN_INVITATION_STATE_UNSPECIFIED'] states = [u'COMPLETE', u'PENDING', u'GUARDIAN_INVITATION_STATE_UNSPECIFIED']
i += 1 i += 1
elif sys.argv[i].lower() == u'states': elif sys.argv[i].lower() == u'states':
states = sys.argv[i+1].split(u',') states = sys.argv[i+1].upper().replace(u',', u' ').split()
i += 2 i += 2
elif sys.argv[i].lower() in usergroup_types: elif sys.argv[i].lower() in usergroup_types:
studentIds = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1]) studentIds = getUsersToModify(entity_type=sys.argv[i], entity=sys.argv[i+1])
i += 2 i += 2
else:
print u'ERROR: %s is not a valid argument for "gam print guardians"' % sys.argv[i]
sys.exit(2)
n = 1 n = 1
for studentId in studentIds: for studentId in studentIds:
kwargs = {u'invitedEmailAddress': invitedEmailAddress, u'studentId': studentId} kwargs = {u'invitedEmailAddress': invitedEmailAddress, u'studentId': studentId}
@@ -2372,7 +2375,7 @@ def doDeleteGuardian():
print u'%s is not a guardian of %s and invitation %s status is %s, not PENDING. Doing nothing.' % (guardianId, studentId, result[u'invitationId'], result[u'state']) print u'%s is not a guardian of %s and invitation %s status is %s, not PENDING. Doing nothing.' % (guardianId, studentId, result[u'invitationId'], result[u'state'])
continue continue
invitationId = result[u'invitationId'] invitationId = result[u'invitationId']
body = { u'state': u'COMPLETE' } body = {u'state': u'COMPLETE'}
callGAPI(croom.userProfiles().guardianInvitations(), u'patch', studentId=studentId, invitationId=invitationId, updateMask=u'state', body=body) callGAPI(croom.userProfiles().guardianInvitations(), u'patch', studentId=studentId, invitationId=invitationId, updateMask=u'state', body=body)
print u'Cancelling %s invitation for %s as guardian of %s' % (result[u'state'], result[u'invitedEmailAddress'], studentId) print u'Cancelling %s invitation for %s as guardian of %s' % (result[u'state'], result[u'invitedEmailAddress'], studentId)