deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-28 18:01:36 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixed bug in gam <UserTypeEntity> print users ... license ... formatjson that caused a trap.

Browse Source
This commit is contained in:
Ross Scroggs
2024-08-11 20:19:59 -07:00
parent 9dab94bd7b
commit 93a6e4d835
5 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GamUpdate.txt
View File

@@ -2,6 +2,10 @@
Merged GAM-Team version
6.79.13
Fixed bug in `gam <UserTypeEntity> print users ... license ... formatjson` that caused a trap.
6.79.12
Fixed bug in `gam user admin@domain.com print chatspaces asadmin` that caused the following error:

38
src/gam/__init__.py
View File

@@ -44131,23 +44131,27 @@ def doPrintUsers(entityList=None):
for userEntity in entityList:
_updateDomainCounts(normalizeEmailAddressOrUID(userEntity))
if not printOptions['countOnly']:
if printOptions['sortHeaders']:
sortTitles = ['primaryEmail']
if printOptions['scalarsFirst']:
sortTitles.extend([f'name{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{field}' for field in USER_NAME_PROPERTY_PRINT_ORDER]+sorted(USER_LANGUAGE_PROPERTY_PRINT_ORDER+USER_SCALAR_PROPERTY_PRINT_ORDER))
csvPF.SetSortTitles(sortTitles)
csvPF.SortTitles()
csvPF.SetSortTitles([])
if sortRows and orderBy:
orderBy = 'primaryEmail' if orderBy == 'email' else f'name.{orderBy}'
csvPF.SortRows(orderBy, reverse=sortOrder == 'DESCENDING')
if printOptions['getGroupFeed']:
if not printOptions['groupsInColumns']:
csvPF.MoveTitlesToEnd(['GroupsCount', 'Groups'])
else:
csvPF.MoveTitlesToEnd(['Groups']+[f'Groups{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{j}' for j in range(printOptions['maxGroups'])])
if printOptions['getLicenseFeed'] or printOptions['getLicenseFeedByUser']:
csvPF.MoveTitlesToEnd(licenseTitles)
if not FJQC.formatJSON:
if printOptions['sortHeaders']:
sortTitles = ['primaryEmail']
if printOptions['scalarsFirst']:
sortTitles.extend([f'name{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{field}' for field in USER_NAME_PROPERTY_PRINT_ORDER]+sorted(USER_LANGUAGE_PROPERTY_PRINT_ORDER+USER_SCALAR_PROPERTY_PRINT_ORDER))
csvPF.SetSortTitles(sortTitles)
csvPF.SortTitles()
csvPF.SetSortTitles([])
if printOptions['getGroupFeed']:
if not printOptions['groupsInColumns']:
csvPF.MoveTitlesToEnd(['GroupsCount', 'Groups'])
else:
csvPF.MoveTitlesToEnd(['Groups']+[f'Groups{GC.Values[GC.CSV_OUTPUT_SUBFIELD_DELIMITER]}{j}' for j in range(printOptions['maxGroups'])])
if printOptions['getLicenseFeed'] or printOptions['getLicenseFeedByUser']:
csvPF.MoveTitlesToEnd(licenseTitles)
if sortRows and orderBy:
orderBy = 'primaryEmail' if orderBy == 'email' else f'name.{orderBy}'
csvPF.SortRows(orderBy, reverse=sortOrder == 'DESCENDING')
else:
if sortRows and orderBy == 'email':
csvPF.SortRows('primaryEmail', reverse=sortOrder == 'DESCENDING')
elif not FJQC.formatJSON:
for domain, count in sorted(iter(domainCounts.items())):
csvPF.WriteRowNoFilter({'domain': domain, 'count': count})