deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 18:31:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jay0lee/GAM

Browse Source
This commit is contained in:
Jay Lee
2020-09-10 11:36:16 -04:00
parent 244398e096 fafd9e2bd8
commit 487e1dc4c1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gam/__init__.py
View File

@@ -8415,12 +8415,12 @@ def _getResoldSubscriptionAttr(arg, customerId):
elif myarg in ['purchaseorderid', 'po']: elif myarg in ['purchaseorderid', 'po']:
body['purchaseOrderId'] = arg[i + 1] body['purchaseOrderId'] = arg[i + 1]
elif myarg in ['seats']: elif myarg in ['seats']:
body['seats']['numberOfSeats'] = getInteger(sys.argv[i + 1], body['seats']['numberOfSeats'] = getInteger(arg[i + 1],
'numberOfSeats', 'numberOfSeats',
minVal=0) minVal=0)
if len(arg) > i + 2 and arg[i + 2].isdigit(): if len(arg) > i + 2 and arg[i + 2].isdigit():
body['seats']['maximumNumberOfSeats'] = getInteger( body['seats']['maximumNumberOfSeats'] = getInteger(
sys.argv[i + 2], 'maximumNumberOfSeats', minVal=0) arg[i + 2], 'maximumNumberOfSeats', minVal=0)
i += 1 i += 1
elif myarg in ['sku', 'skuid']: elif myarg in ['sku', 'skuid']:
_, body['skuId'] = getProductAndSKU(arg[i + 1]) _, body['skuId'] = getProductAndSKU(arg[i + 1])

8
src/gam/gapi/cloudidentity/groups.py
View File

@@ -233,7 +233,7 @@ def print_():
page_message=page_message, page_message=page_message,
message_attribute=['groupKey', 'id'], message_attribute=['groupKey', 'id'],
parent=parent, parent=parent,
srcview='FULL', view='FULL',
pageSize=500) pageSize=500)
i = 0 i = 0
count = len(entityList) count = len(entityList)
@@ -251,14 +251,14 @@ def print_():
) )
page_message = gapi.got_total_items_first_last_msg('Members') page_message = gapi.got_total_items_first_last_msg('Members')
validRoles, _, _ = gam._getRoleVerification( validRoles, _, _ = gam._getRoleVerification(
roles, 'nextPageToken,members(email,id,role)') '.'.join(roles), 'nextPageToken,members(email,id,role)')
groupMembers = gapi.get_all_pages(ci.groups().memberships(), groupMembers = gapi.get_all_pages(ci.groups().memberships(),
'list', 'list',
'memberships', 'memberships',
page_message=page_message, page_message=page_message,
message_attribute='email', message_attribute=['memberKey', 'id'],
soft_errors=True, soft_errors=True,
groupKey_id=groupKey_id, parent=groupKey_id,
view='BASIC') view='BASIC')
if members: if members:
membersList = [] membersList = []