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 some possible label inconsistencies when restoring apps permissions

Browse source
This commit is contained in:
Alexandre Aubin 2020-10-29 23:35:03 +01:00
parent e91f2de0dc
commit 00a10c9a5d
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/yunohost/backup.py
View file

@ -1213,13 +1213,13 @@ class RestoreManager():
# Restore permission for the app which is installed # Restore permission for the app which is installed
for permission_name, permission_infos in old_apps_permission.items(): for permission_name, permission_infos in old_apps_permission.items():
app_name = permission_name.split(".")[0] app_name, perm_name = permission_name.split(".")
if _is_installed(app_name): if _is_installed(app_name):
permission_create(permission_name, allowed=permission_infos["allowed"], permission_create(permission_name, allowed=permission_infos["allowed"],
url=permission_infos["url"], url=permission_infos["url"],
additional_urls=permission_infos['additional_urls'], additional_urls=permission_infos['additional_urls'],
auth_header=permission_infos['auth_header'], auth_header=permission_infos['auth_header'],
label=permission_infos['label'], label=permission_infos['label'] if perm_name == "main" else permission_infos["sublabel"],
show_tile=permission_infos['show_tile'], show_tile=permission_infos['show_tile'],
protected=permission_infos["protected"], sync_perm=False) protected=permission_infos["protected"], sync_perm=False)
@ -1340,10 +1340,16 @@ class RestoreManager():
else: else:
should_be_allowed = [g for g in permission_infos["allowed"] if g in existing_groups] should_be_allowed = [g for g in permission_infos["allowed"] if g in existing_groups]
permission_create(permission_name, allowed=should_be_allowed, perm_name = permission_name.split(".")[1]
url=permission_infos.get("url", None), additional_urls=permission_infos.get("additional_urls", None), auth_header=permission_infos.get("auth_header", None), permission_create(permission_name,
label=permission_infos.get("label", None), show_tile=permission_infos.get("show_tile", None), allowed=should_be_allowed,
protected=permission_infos.get("protected", True), sync_perm=False) url=permission_infos.get("url"),
additional_urls=permission_infos.get("additional_urls"),
auth_header=permission_infos.get("auth_header"),
label=permission_infos.get('label') if perm_name == "main" else permission_infos.get("sublabel"),
show_tile=permission_infos.get("show_tile", None),
protected=permission_infos.get("protected", True),
sync_perm=False)
permission_sync_to_user() permission_sync_to_user()