From f6792d2d00a9a39a47dbebb1f2507915cb13954a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Tue, 24 Mar 2015 20:17:35 +0100 Subject: [PATCH] [fix] Adapt broken calls to user_list --- lib/yunohost/app.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/yunohost/app.py b/lib/yunohost/app.py index b0093cbd..750eea7f 100644 --- a/lib/yunohost/app.py +++ b/lib/yunohost/app.py @@ -555,9 +555,7 @@ def app_addaccess(auth, apps, users): from yunohost.hook import hook_callback if not users: - users = [] - for user in user_list(auth)['users']: - users.append(user['username']) + users = user_list(auth)['users'].keys() if not isinstance(users, list): users = [users] if not isinstance(apps, list): apps = [apps] @@ -637,12 +635,12 @@ def app_removeaccess(auth, apps, users): else: new_users = new_users +','+ allowed_user else: - new_users='' - for user in user_list(auth)['users']: - if user['username'] not in users: + new_users = '' + for username in user_list(auth)['users'].keys(): + if username not in users: if new_users == '': - new_users = user['username'] - new_users=new_users+','+user['username'] + new_users = username + new_users += ',' + username app_setting(app, 'allowed_users', new_users.strip()) hook_callback('post_app_removeaccess', args=[app, new_users]) @@ -882,8 +880,8 @@ def app_ssowatconf(auth): domains = domain_list(auth)['domains'] users = {} - for user in user_list(auth)['users']: - users[user['username']] = app_map(user=user['username']) + for username in user_list(auth)['users'].keys(): + users[username] = app_map(user=username) skipped_urls = [] skipped_regex = []