From 6054e4eb3cf29c7c0b0fa87c88aa63eed63e0995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 16 Jan 2019 00:00:54 +0100 Subject: [PATCH] Improve permission list --- src/yunohost/permission.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index 4be463e50..421f1ff2f 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -61,13 +61,10 @@ def user_permission_list(auth, app=None, permission=None, username=None, group=N app = [app] if permission and not isinstance(permission, list): permission = [permission] + if not isinstance(username, list): + username = [username] if not isinstance(group, list): group = [group] - if isinstance(username, list): - group.extend(username) - else: - group.append(username) - group = filter(None, group) permissions = {} @@ -94,7 +91,9 @@ def user_permission_list(auth, app=None, permission=None, username=None, group=N continue if permission and not permission_name in permission: continue - if group and not set(group) & set(group_name): + if username[0] and not set(username) & set(user_name): + continue + if group[0] and not set(group) & set(group_name): continue if not app_name in permissions: