YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #40 from titoko/dev

Browse source 
Add/remove access
This commit is contained in:
Alexis Gavoty 2013-12-05 13:42:45 -08:00
commit aa4c680943
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
yunohost_app.py
View file

@ -520,7 +520,6 @@ def app_removeaccess(apps, users):
#TODO: Remove access
if not isinstance(users, list): users = [users]
if not isinstance(apps, list): apps = [apps]
for app in apps:
new_users = ''
@ -530,7 +529,7 @@ def app_removeaccess(apps, users):
with open(apps_setting_path + app +'/settings.yml') as f:
app_settings = yaml.load(f)
if 'mode' in app_settings and app_settings['mode'] == 'private':
if 'skipped_uris' not in app_settings or app_settings['skipped_uris'] != '/':
if 'allowed_users' in app_settings:
for allowed_user in app_settings['allowed_users'].split(','):
if allowed_user not in users:
@ -538,8 +537,15 @@ def app_removeaccess(apps, users):
new_users = allowed_user
else:
new_users = new_users +','+ allowed_user
app_setting(app, 'allowed_users', new_users.strip())
else:
new_users=''
for user in user_list()['Users']:
if user['Username'] not in users:
if new_users == '':
new_users = user['Username']
new_users=new_users+','+user['Username']
app_setting(app, 'allowed_users', new_users.strip())
app_ssowatconf()