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

Try to improve readability for these conditions

Browse source
This commit is contained in:
Alexandre Aubin 2019-11-29 16:41:50 +01:00 • committed by Alexandre Aubin
parent af054b3b85
commit a5866e67b9
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/permission.py
View file

@ -138,11 +138,12 @@ def user_permission_update(operation_logger, permission, add=None, remove=None,
new_allowed_groups = [g for g in new_allowed_groups if g not in groups_to_remove] new_allowed_groups = [g for g in new_allowed_groups if g not in groups_to_remove]
# If we end up with something like allowed groups is ["all_users", "volunteers"] # If we end up with something like allowed groups is ["all_users", "volunteers"]
# we shall warn the users that they should probably choose between one or the other, # we shall warn the users that they should probably choose between one or
# because the current situation is probably not what they expect / is temporary ? # the other, because the current situation is probably not what they expect
# / is temporary ? Note that it's fine to have ["all_users", "visitors"]
if "all_users" in new_allowed_groups: # though, but it's not fine to have ["all_users", "visitors", "volunteers"]
if len(new_allowed_groups) > 1 and "visitors" not in new_allowed_groups or len(new_allowed_groups) > 2: if "all_users" in new_allowed_groups and len(new_allowed_groups) >= 2:
if "visitors" not in new_allowed_groups or len(new_allowed_groups) >= 3:
logger.warning(m18n.n("permission_currently_allowed_for_all_users")) logger.warning(m18n.n("permission_currently_allowed_for_all_users"))
# If visitors are allowed, but not all users, it can break some applications, so we prohibit it. # If visitors are allowed, but not all users, it can break some applications, so we prohibit it.