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

Move 'label' migration to migrate_legacy_permission_settings in legacy.py, because the previous code could led to some inconsistencies when restoring apps backuped before the migration

Browse source
This commit is contained in:
Alexandre Aubin 2020-10-29 23:26:28 +01:00
parent e047b67b1d
commit e91f2de0dc
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/yunohost/data_migrations/0019_extends_permissions_features_1.py
View file

@ -6,7 +6,6 @@ from yunohost.utils.error import YunohostError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.app import app_setting, _installed_apps
from yunohost.permission import user_permission_list from yunohost.permission import user_permission_list
from yunohost.utils.legacy import migrate_legacy_permission_settings from yunohost.utils.legacy import migrate_legacy_permission_settings
@ -39,11 +38,6 @@ class MyMigration(Migration):
ldap = _get_ldap_interface() ldap = _get_ldap_interface()
permission_list = user_permission_list(full=True)["permissions"] permission_list = user_permission_list(full=True)["permissions"]
labels = {}
for app in _installed_apps():
labels[app] = app_setting(app, 'label') or permission_list[app + ".main"].get("label") or app
app_setting(app, 'label', delete=True)
for permission in permission_list: for permission in permission_list:
if permission.split('.')[0] == 'mail': if permission.split('.')[0] == 'mail':
ldap.update('cn=%s,ou=permission' % permission, { ldap.update('cn=%s,ou=permission' % permission, {
@ -74,19 +68,18 @@ class MyMigration(Migration):
'isProtected': ["TRUE"], 'isProtected': ["TRUE"],
}) })
else: else:
label = labels[permission.split('.')[0]].title() app, subperm_name = permission.split('.')
if permission.endswith(".main"): if permission.endswith(".main"):
ldap.update('cn=%s,ou=permission' % permission, { ldap.update('cn=%s,ou=permission' % permission, {
'authHeader': ["TRUE"], 'authHeader': ["TRUE"],
'label': [label], 'label': [app], # Note that this is later re-changed during the call to migrate_legacy_permission_settings() if a 'label' setting exists
'showTile': ["TRUE"], 'showTile': ["TRUE"],
'isProtected': ["FALSE"] 'isProtected': ["FALSE"]
}) })
else: else:
ldap.update('cn=%s,ou=permission' % permission, { ldap.update('cn=%s,ou=permission' % permission, {
'authHeader': ["TRUE"], 'authHeader': ["TRUE"],
'label': [permission.split('.')[1]], 'label': [subperm_name.title()],
'showTile': ["FALSE"], 'showTile': ["FALSE"],
'isProtected': ["TRUE"] 'isProtected': ["TRUE"]
}) })

4
src/yunohost/utils/legacy.py
View file

@ -162,6 +162,9 @@ def migrate_legacy_permission_settings(app=None):
for app in apps: for app in apps:
settings = _get_app_settings(app) or {} settings = _get_app_settings(app) or {}
if settings.get("label"):
user_permission_update(app + ".main", label=settings["label"], sync_perm=False)
del settings["label"]
def _setting(name): def _setting(name):
s = settings.get(name) s = settings.get(name)
@ -203,4 +206,3 @@ def migrate_legacy_permission_settings(app=None):
_set_app_settings(app, settings) _set_app_settings(app, settings)
permission_sync_to_user() permission_sync_to_user()