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

Add groupidfllert <String> to gam report <ActivityApplicationName> (#1390)

Browse Source
This commit is contained in:
Ross Scroggs
2021-06-28 18:34:50 -07:00
committed by GitHub
parent 80d17cfda3
commit 1c78ebd20e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/GamCommands.txt
View File

@@ -959,6 +959,7 @@ gam report <ActivityApplicationName> [todrive]
[(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)] [(user all|<UserItem>)|(orgunit|org|ou <OrgUnitPath>)]
[start <Time>] [end <Time>] [start <Time>] [end <Time>]
[filter|filters <String>] [event <String>] [ip <String>] [filter|filters <String>] [event <String>] [ip <String>]
[groupidfilter <String>]
gam create admin <UserItem> <RoleItem> customer|(org_unit <OrgUnitItem>) gam create admin <UserItem> <RoleItem> customer|(org_unit <OrgUnitItem>)
gam delete admin <RoleAssignmentId> gam delete admin <RoleAssignmentId>

8
src/gam/gapi/reports.py
View File

@@ -285,7 +285,7 @@ def showReport():
customerId = GC_Values[GC_CUSTOMER_ID] customerId = GC_Values[GC_CUSTOMER_ID]
if customerId == MY_CUSTOMER: if customerId == MY_CUSTOMER:
customerId = None customerId = None
filters = parameters = actorIpAddress = startTime = endTime = eventName = orgUnitId = None filters = parameters = actorIpAddress = groupIdFilter = startTime = endTime = eventName = orgUnitId = None
tryDate = datetime.date.today().strftime(YYYYMMDD_FORMAT) tryDate = datetime.date.today().strftime(YYYYMMDD_FORMAT)
to_drive = False to_drive = False
userKey = 'all' userKey = 'all'
@@ -330,6 +330,9 @@ def showReport():
elif myarg == 'ip': elif myarg == 'ip':
actorIpAddress = sys.argv[i + 1] actorIpAddress = sys.argv[i + 1]
i += 2 i += 2
elif myarg == 'groupidfilter':
groupIdFilter = sys.argv[i + 1]
i += 2
elif myarg == 'todrive': elif myarg == 'todrive':
to_drive = True to_drive = True
i += 1 i += 1
@@ -489,7 +492,8 @@ def showReport():
endTime=endTime, endTime=endTime,
eventName=eventName, eventName=eventName,
filters=filters, filters=filters,
orgUnitID=orgUnitId) orgUnitID=orgUnitId,
groupIdFilter=groupIdFilter)
if activities: if activities:
titles = ['name'] titles = ['name']
csvRows = [] csvRows = []