deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-10 06:33:34 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Clean up group_inde (#1203)

Browse Source
This commit is contained in:
Ross Scroggs
2020-05-26 12:09:15 -07:00
committed by GitHub
parent d2199a5b9c
commit 7937fd00d4
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam/__init__.py
View File

@ -12118,7 +12118,6 @@ def getUsersToModify(entity_type=None,
checkSuspended=None, checkSuspended=None,
groupUserMembersOnly=True): groupUserMembersOnly=True):
got_uids = False got_uids = False
includeDerivedMembership = False
if entity_type is None: if entity_type is None:
entity_type = sys.argv[1].lower() entity_type = sys.argv[1].lower()
if entity is None: if entity is None:
@ -12130,13 +12129,12 @@ def getUsersToModify(entity_type=None,
] ]
elif entity_type == 'users': elif entity_type == 'users':
users = entity.replace(',', ' ').split() users = entity.replace(',', ' ').split()
elif entity_type in ['group', 'group_ns', 'group_susp','group_inde']: elif entity_type in ['group', 'group_ns', 'group_susp', 'group_inde']:
if entity_type == 'group_ns': if entity_type == 'group_ns':
checkSuspended = False checkSuspended = False
elif entity_type == 'group_susp': elif entity_type == 'group_susp':
checkSuspended = True checkSuspended = True
if entity_type == 'group_inde': includeDerivedMembership = entity_type == 'group_inde'
includeDerivedMembership = True
got_uids = True got_uids = True
group = entity group = entity
if member_type is None: if member_type is None:

2
src/gam/var.py
View File

@ -26,7 +26,7 @@ GAM_PROJECT_FILEPATH = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src
true_values = ['on', 'yes', 'enabled', 'true', '1'] true_values = ['on', 'yes', 'enabled', 'true', '1']
false_values = ['off', 'no', 'disabled', 'false', '0'] false_values = ['off', 'no', 'disabled', 'false', '0']
usergroup_types = [ usergroup_types = [
'user', 'users', 'group', 'group_ns', 'grooup_susp', 'ou', 'org', 'ou_ns', 'user', 'users', 'group', 'group_ns', 'group_susp', 'group_inde', 'ou', 'org', 'ou_ns',
'org_ns', 'ou_susp', 'org_susp', 'ou_and_children', 'ou_and_child', 'org_ns', 'ou_susp', 'org_susp', 'ou_and_children', 'ou_and_child',
'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp', 'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp',
'ou_and_child_susp', 'query', 'queries', 'license', 'licenses', 'licence', 'ou_and_child_susp', 'query', 'queries', 'license', 'licenses', 'licence',