diff --git a/docs/Calendars-Events.md b/docs/Calendars-Events.md index c492f7cb..0b442ec0 100644 --- a/docs/Calendars-Events.md +++ b/docs/Calendars-Events.md @@ -66,9 +66,12 @@ Client access works when accessing Resource calendars. See: https://github.com/GAM-team/GAM/wiki/Collections-of-Items ::= (.)+ ::= @ - ::= "(,)*" - ::= | | | | + ::= "(,)*" + ::= + | | | + | See: https://github.com/GAM-team/GAM/wiki/Collections-of-Items + ::= ::= attachments.fileid| diff --git a/docs/GamUpdates.md b/docs/GamUpdates.md index c253d526..0d2bf9c7 100644 --- a/docs/GamUpdates.md +++ b/docs/GamUpdates.md @@ -10,6 +10,10 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 7.00.36 + +Updated `gam print chromeapps` to correct a trap caused by an API change. + ### 7.00.35 Classification labels are now available for Gmail in addition to Drive. diff --git a/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md b/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md index 67cb8331..9c2b8ce6 100644 --- a/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md +++ b/docs/How-to-Upgrade-Legacy-GAM-to-GAM7.md @@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin$ gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.00.36 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.0 64-bit final MacOS Sonoma 14.5 x86_64 @@ -923,7 +923,7 @@ writes the credentials into the file oauth2.txt. C:\>del C:\GAMConfig\oauth2.txt C:\>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAM7 7.00.35 - https://github.com/GAM-team/GAM - pythonsource +GAM7 7.00.36 - https://github.com/GAM-team/GAM - pythonsource GAM Team Python 3.13.0 64-bit final Windows-10-10.0.17134 AMD64 diff --git a/docs/Users-Calendars-Events.md b/docs/Users-Calendars-Events.md index 94221084..58b16d1e 100644 --- a/docs/Users-Calendars-Events.md +++ b/docs/Users-Calendars-Events.md @@ -91,20 +91,23 @@ ::= (json [charset ] ) | (json file [charset ]) | + ::= + ::= "(,)*" + ::= | | | + See: https://github.com/GAM-team/GAM/wiki/Collections-of-Items ::= (.)+ ::= @ ::= "(,)*" ::= - | | | + | | | | See: https://github.com/GAM-team/GAM/wiki/Collections-of-Users - ::= - ::= "(,)*" ::= ::= |d: ::= "(,)*" ::= active|archived|provisioned|declined ::= all|"(,)*" + ::= ::= ::= "(,)*" ::= id: @@ -122,7 +125,7 @@ allcalendars| primary| | - | + | (courses )| ((courses_with_teacher )|my_courses_as_teacher [coursestates ])| diff --git a/docs/Version-and-Help.md b/docs/Version-and-Help.md index 0f814fe2..013e30a0 100644 --- a/docs/Version-and-Help.md +++ b/docs/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.00.36 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.0 64-bit final MacOS Sonoma 14.5 x86_64 @@ -15,7 +15,7 @@ Time: 2023-06-02T21:10:00-07:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.00.36 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.0 64-bit final MacOS Sonoma 14.5 x86_64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAM 7.00.35 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.00.36 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.13.0 64-bit final MacOS Sonoma 14.5 x86_64 @@ -64,7 +64,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/Admin/bin/gam7 Version Check: Current: 5.35.08 - Latest: 7.00.35 + Latest: 7.00.36 echo $? 1 ``` @@ -72,7 +72,7 @@ echo $? Print the current version number without details ``` gam version simple -7.00.35 +7.00.36 ``` In Linux/MacOS you can do: ``` @@ -82,7 +82,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 7.00.35 - https://github.com/GAM-team/GAM +GAM 7.00.36 - https://github.com/GAM-team/GAM GAM Team Python 3.13.0 64-bit final MacOS Sonoma 14.5 x86_64 diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 701c30d9..eef6db3a 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,7 @@ +7.00.36 + +Updated `gam print chromeapps` to correct a trap caused by an API change. + 7.00.35 Classification labels are now available for Gmail in addition to Drive. diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 8b62e18e..1a383192 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki """ __author__ = 'GAM Team ' -__version__ = '7.00.35' +__version__ = '7.00.36' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -29839,7 +29839,7 @@ def doPrintShowChromeApps(): app['orgUnitPath'] = orgUnitPath row = flattenJSON(app, simpleLists=['permissions'], delimiter=delimiter) if not FJQC.formatJSON: - csvPF.WriteRow(row) + csvPF.WriteRowTitles(row) elif csvPF.CheckRowTitles(row): csvPF.WriteRowNoFilter({'appId': app['appId'], 'JSON': json.dumps(cleanJSON(app), ensure_ascii=False, sort_keys=True)})