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

Fix user_permission_list

Browse source
This commit is contained in:
Josué Tille 2020-04-03 23:51:10 +02:00
parent e6ccb01af1
commit b859953aa4
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/permission.py
View file

@ -60,7 +60,9 @@ def user_permission_list(short=False, full=False, ignore_system_perms=False, ful
'URL', 'additionalUrls', 'authHeader', 'label', 'showTile', 'isProtected'])
# Parse / organize information to be outputed
apps_main_path = {app['id']: app_setting(app['id'], 'domain') + app_setting(app['id'], 'path') for app in app_list()['apps']}
apps_main_path = {app['id']: app_setting(app['id'], 'domain') + app_setting(app['id'], 'path')
for app in app_list()['apps']
if app_setting(app['id'], 'domain') and app_setting(app['id'], 'path')}
permissions = {}
for infos in permissions_infos:
@ -79,7 +81,7 @@ def user_permission_list(short=False, full=False, ignore_system_perms=False, ful
permissions[name]["label"] = infos.get("label", [None])[0]
permissions[name]["show_tile"] = infos.get("showTile", [False])[0] == "TRUE"
permissions[name]["protected"] = infos.get("isProtected", [False])[0] == "TRUE"
if full_path and name.split(".")[0] not in SYSTEM_PERMS:
if full_path and name.split(".")[0] in apps_main_path:
permissions[name]["url"] = _get_full_url(infos.get("URL", [None])[0], apps_main_path[name.split('.')[0]])
permissions[name]["additional_urls"] = [_get_full_url(url, apps_main_path[name.split('.')[0]]) for url in infos.get("additionalUrls", [None])]
else: