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

Improve permission list

Browse source
This commit is contained in:
Josué Tille 2019-01-16 00:00:54 +01:00
parent e199b03d7d
commit 6054e4eb3c
No known key found for this signature in database
GPG key ID: D5E068C6DFA8681D
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/permission.py
View file

@ -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: