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

Implement restore permission

Browse source
This commit is contained in:
Josué Tille 2019-12-23 16:07:06 +01:00
parent 9aecacd995
commit 175a87bd30
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/backup.py
View file

@ -1250,7 +1250,8 @@ class RestoreManager():
for permission_name, permission_infos in old_apps_permission.items():
app_name = permission_name.split(".")[0]
if _is_installed(app_name):
permission_create(permission_name, url=permission_infos["url"], allowed=permission_infos["allowed"], sync_perm=False)
permission_create(permission_name, url=permission_infos["url"], allowed=permission_infos["allowed"],
protected=permission_infos["protected"], sync_perm=False)
permission_sync_to_user()
@ -1372,7 +1373,8 @@ class RestoreManager():
else:
should_be_allowed = [g for g in permission_infos["allowed"] if g in existing_groups]
permission_create(permission_name, url=permission_infos.get("url", None), allowed=should_be_allowed, sync_perm=False)
permission_create(permission_name, url=permission_infos.get("url", None), allowed=should_be_allowed,
protected=permission_infos.get("protected", True), sync_perm=False)
permission_sync_to_user()

2
src/yunohost/data_migrations/0011_setup_group_permission.py
View file

@ -116,7 +116,7 @@ class MyMigration(Migration):
allowed = [user for user in permission.split(',') if user in known_users]
else:
allowed = ["all_users"]
permission_create(app+".main", url=url, allowed=allowed, sync_perm=False)
permission_create(app+".main", url=url, allowed=allowed, protected=False, sync_perm=False)
app_setting(app, 'allowed_users', delete=True)