gam7 7.6.3__py3-none-any.whl → 7.6.5__py3-none-any.whl

gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.06.03'
+__version__ = '7.06.05'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -14145,6 +14145,7 @@ def doReport():
       startDateTime += oneDay
     csvPF.writeCSVfile(f'Customer Report - {tryDate}')
   else: # activityReports
+    csvPF.SetTitles('name')
     if addCSVData:
       csvPF.AddTitles(sorted(addCSVData.keys()))
     if select:
@@ -14303,8 +14304,7 @@ def doReport():
         row = {'name': 'NoActivities'}
         if addCSVData:
           row.update(addCSVData)
-          csvPF.WriteRowTitles(row)
-      csvPF.SetSortTitles(['name'])
+        csvPF.WriteRowTitles(row)
     else:
       if eventRowFilter:
         csvPF.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE])
@@ -28090,10 +28090,12 @@ def updatePolicyRequests(body, targetResource, printer_id, app_id):
   for request in body['requests']:
     request.setdefault('policyTargetKey', {})
     request['policyTargetKey']['targetResource'] = targetResource
-    if app_id:
-      request['policyTargetKey']['additionalTargetKeys'] = {'app_id': app_id}
-    elif printer_id:
-      request['policyTargetKey']['additionalTargetKeys'] = {'printer_id': printer_id}
+    if app_id or printer_id:
+      request['policyTargetKey'].setdefault('additionalTargetKeys', {})
+      if app_id:
+        request['policyTargetKey']['additionalTargetKeys']['app_id'] = app_id
+      elif printer_id:
+        request['policyTargetKey']['additionalTargetKeys']['printer_id'] = printer_id
 
 # gam delete chromepolicy
 #	(<SchemaName> [<JSONData>])+
@@ -28126,9 +28128,9 @@ def doDeleteChromePolicy():
       if checkArgumentPresent('json'):
         jsonData = getJSON(['direct', 'name', 'orgUnitPath', 'parentOrgUnitPath', 'group'])
         if 'additionalTargetKeys' in jsonData:
-          body['requests'][-1].setdefault('policyTargetKey', {})
+          body['requests'][-1].setdefault('policyTargetKey', {'additionalTargetKeys': {}})
           for atk in jsonData['additionalTargetKeys']:
-            body['requests'][-1]['policyTargetKey']['additionalTargetKeys'] = {atk['name']: atk['value']}
+            body['requests'][-1]['policyTargetKey']['additionalTargetKeys'][atk['name']] = atk['value']
   checkPolicyArgs(targetResource, printer_id, app_id)
   count = len(body['requests'])
   if count != 1:
@@ -28281,9 +28283,9 @@ def doUpdateChromePolicy():
           jsonData = getJSON(['direct', 'name', 'orgUnitPath', 'parentOrgUnitPath', 'group'])
           schemaNameAppId = schemaName
           if 'additionalTargetKeys' in jsonData:
-            body['requests'][-1].setdefault('policyTargetKey', {})
+            body['requests'][-1].setdefault('policyTargetKey', {'additionalTargetKeys': {}})
             for atk in jsonData['additionalTargetKeys']:
-              body['requests'][-1]['policyTargetKey']['additionalTargetKeys'] = {atk['name']: atk['value']}
+              body['requests'][-1]['policyTargetKey']['additionalTargetKeys'][atk['name']] = atk['value']
               if atk['name'] == 'app_id':
                 schemaNameAppId += f"({atk['value']})"
           schemaNameList[-1] = schemaNameAppId

{gam7-7.6.3.dist-info → gam7-7.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.6.3
+Version: 7.6.5
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.6.3.dist-info → gam7-7.6.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=FKh8G6PP-PAQ2Nxej7xnFRZmPMW-ElcZ9X29HSSs8S4,3492291
+gam/__init__.py,sha256=_B7W6ZWE2Lo0CHTzFB8tAcUT1T9oTLv4BKiXL04OwoQ,3492434
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=nJuWha0xm5dHw_5ptGphwRoO-r36Ccpqiww9pCEDbSc,67484
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
 gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
 gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
 gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
-gam7-7.6.3.dist-info/METADATA,sha256=MazHA6rGk3zT2dQ2lCwJOJV6IQoMchyZdepmc61ojZs,2888
-gam7-7.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.6.3.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.6.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.6.3.dist-info/RECORD,,
+gam7-7.6.5.dist-info/METADATA,sha256=QWaYkBsos7gNgLYbDbMQu8PIv3wz3s8qLV0kFU1oYJQ,2888
+gam7-7.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.6.5.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.6.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.6.5.dist-info/RECORD,,