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

Fixed bug introduced in 7.30.00 that caused errors when reading CSV files

Browse Source
This commit is contained in:
Ross Scroggs
2025-12-12 14:23:31 -08:00
parent c2ca6c0180
commit 31d20985b7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam/__init__.py
View File

@@ -67693,6 +67693,10 @@ def _getSharedDriveRestrictions(myarg, body):
return True return True
return False return False
def _checkSharedDriveRestrictions(body):
if 'copyRequiresWriterPermission' in body['restrictions'] and 'downloadRestriction' in body['restrictions']:
usageErrorExit(Msg.ARE_MUTUALLY_EXCLUSIVE.format('copyrequireswriterpermission', 'downloadrestrictedforreaders|downloadrestrictedforwriters'))
def _moveSharedDriveToOU(orgUnit, orgUnitId, driveId, user, i, count, ci, returnIdOnly): def _moveSharedDriveToOU(orgUnit, orgUnitId, driveId, user, i, count, ci, returnIdOnly):
action = Act.Get() action = Act.Get()
name = f'orgUnits/-/memberships/shared_drive;{driveId}' name = f'orgUnits/-/memberships/shared_drive;{driveId}'
@@ -67771,6 +67775,7 @@ def createSharedDrive(users, useDomainAdminAccess=False):
moveToOrgUnitDelay = getInteger(minVal=0, maxVal=60) moveToOrgUnitDelay = getInteger(minVal=0, maxVal=60)
else: else:
unknownArgumentExit() unknownArgumentExit()
_checkSharedDriveRestrictions(body)
if csvPF: if csvPF:
csvPF.SetTitles(['User', 'name', 'id']) csvPF.SetTitles(['User', 'name', 'id'])
if addCSVData: if addCSVData:
@@ -67914,6 +67919,7 @@ def updateSharedDrive(users, useDomainAdminAccess=False):
useDomainAdminAccess = True useDomainAdminAccess = True
else: else:
unknownArgumentExit() unknownArgumentExit()
_checkSharedDriveRestrictions(body)
i, count, users = getEntityArgument(users) i, count, users = getEntityArgument(users)
for user in users: for user in users:
i += 1 i += 1