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

fix reporting orgunit scoping

Browse Source
This commit is contained in:
Jay Lee
2020-09-30 16:44:48 -04:00
parent 57860dc5a6
commit 02fa092775
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ from gam import controlflow
from gam import display from gam import display
from gam import gapi from gam import gapi
from gam import utils from gam import utils
from gam.gapi.directory import orgunits as gapi_directory_orgunits
def build(): def build():
@@ -178,7 +179,7 @@ def showUsage():
skip_day_numbers = [dow.index(d) for d in skipdaynames if d in dow] skip_day_numbers = [dow.index(d) for d in skipdaynames if d in dow]
i += 2 i += 2
elif report == 'user' and myarg in ['orgunit', 'org', 'ou']: elif report == 'user' and myarg in ['orgunit', 'org', 'ou']:
_, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1]) _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
i += 2 i += 2
elif report == 'user' and myarg in usergroup_types: elif report == 'user' and myarg in usergroup_types:
users = gam.getUsersToModify(myarg, sys.argv[i + 1]) users = gam.getUsersToModify(myarg, sys.argv[i + 1])
@@ -296,7 +297,7 @@ def showReport():
tryDate = utils.get_yyyymmdd(sys.argv[i + 1]) tryDate = utils.get_yyyymmdd(sys.argv[i + 1])
i += 2 i += 2
elif myarg in ['orgunit', 'org', 'ou']: elif myarg in ['orgunit', 'org', 'ou']:
_, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1]) _, orgUnitId = gapi_directory_orgunits.getOrgUnitId(sys.argv[i + 1])
i += 2 i += 2
elif myarg == 'fulldatarequired': elif myarg == 'fulldatarequired':
fullDataRequired = [] fullDataRequired = []