[Fix] permission create

This commit is contained in:
Kay0u 2019-11-20 13:28:10 +09:00
parent 67816ad18e
commit a959a97e8c
No known key found for this signature in database
GPG key ID: 7FF262C033518333

View file

@ -273,9 +273,8 @@ def permission_create(operation_logger, permission, url=None, allowed=None, sync
if allowed: if allowed:
if not isinstance(allowed, list): if not isinstance(allowed, list):
to_add = [allowed] to_add = [allowed]
# For main permission, we add all users by default else:
elif permission.endswith(".main"): to_add = allowed
to_add = "all_users"
new_permission = _update_ldap_group_permission(permission=permission, allowed=to_add, sync_perm=sync_perm) new_permission = _update_ldap_group_permission(permission=permission, allowed=to_add, sync_perm=sync_perm)
@ -295,6 +294,10 @@ def permission_url(operation_logger, permission, url=None, sync_perm=True):
from yunohost.utils.ldap import _get_ldap_interface from yunohost.utils.ldap import _get_ldap_interface
ldap = _get_ldap_interface() ldap = _get_ldap_interface()
# By default, manipulate main permission
if "." not in permission:
permission = permission + ".main"
# Fetch existing permission # Fetch existing permission
existing_permission = user_permission_list(full=True)["permissions"].get(permission, None) existing_permission = user_permission_list(full=True)["permissions"].get(permission, None)