YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Clarify condition using a list

Browse source
This commit is contained in:
Alexandre Aubin 2019-03-05 02:12:40 +01:00
parent 13c6c9e500
commit 1d4dfd5242
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -218,7 +218,7 @@
"group_creation_failed": "Group creation failed for group '{group}'", "group_creation_failed": "Group creation failed for group '{group}'",
"group_deleted": "Group '{group}' deleted", "group_deleted": "Group '{group}' deleted",
"group_deletion_failed": "Group '{group} 'deletion failed", "group_deletion_failed": "Group '{group} 'deletion failed",
"group_deletion_not_allowed": "You are not allowed to remove the main group of the user {user:s}", "group_deletion_not_allowed": "The group {group:s} cannot be deleted manually.",
"group_info_failed": "Group info failed", "group_info_failed": "Group info failed",
"group_unknown": "Group {group:s} unknown", "group_unknown": "Group {group:s} unknown",
"group_updated": "Group '{group}' updated", "group_updated": "Group '{group}' updated",

10
src/yunohost/user.py
View file

@ -594,11 +594,9 @@ def user_group_delete(operation_logger, auth, groupname, force=False, sync_perm=
""" """
from yunohost.permission import permission_sync_to_user from yunohost.permission import permission_sync_to_user
if not force \ forbidden_groups = ["all_users", "admins"] + user_list(auth, fields=['uid'])['users'].keys()
and (groupname == 'all_users' or if not force and groupname in forbidden_groups:
groupname == 'admins' or raise YunohostError('group_deletion_not_allowed', group=groupname)
groupname in user_list(auth, fields=['uid'])['users']):
raise YunohostError('group_deletion_not_allowed', user=groupname)
operation_logger.start() operation_logger.start()
if not auth.remove('cn=%s,ou=groups' % groupname): if not auth.remove('cn=%s,ou=groups' % groupname):
@ -640,7 +638,7 @@ def user_group_update(operation_logger, auth, groupname, add_user=None, remove_u
else: else:
group['member'] = [] group['member'] = []
existing_users = user_list(auth, fields=['uid'])['users'] existing_users = user_list(auth, fields=['uid'])['users'].keys()
if add_user: if add_user:
if not isinstance(add_user, list): if not isinstance(add_user, list):