From 0828eec7298c405fba8a1e98de3b21450f69a628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 6 Apr 2020 11:40:35 +0200
Subject: [PATCH] Fix postinstall and backup restore

---
 data/other/ldap_scheme.yml                                 | 6 ++++++
 src/yunohost/backup.py                                     | 7 ++++++-
 .../data_migrations/0015_extends_permissions_features_1.py | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/data/other/ldap_scheme.yml b/data/other/ldap_scheme.yml
index 769de0b2e..8fdded8ac 100644
--- a/data/other/ldap_scheme.yml
+++ b/data/other/ldap_scheme.yml
@@ -73,6 +73,9 @@ depends_children:
             - permissionYnh
         groupPermission:
             - "cn=all_users,ou=groups,dc=yunohost,dc=org"
+        authHeader: "FALSE"
+        label: "Mail"
+        showTile: "FALSE"
         isProtected: "TRUE"
     cn=xmpp.main,ou=permission:
         cn: xmpp.main
@@ -82,4 +85,7 @@ depends_children:
             - permissionYnh
         groupPermission:
             - "cn=all_users,ou=groups,dc=yunohost,dc=org"
+        authHeader: "FALSE"
+        label: "XMPP"
+        showTile: "FALSE"
         isProtected: "TRUE"
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index f8a2f54ba..6a287b631 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -1247,7 +1247,12 @@ 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"],
+                permission_create(permission_name, allowed=permission_infos["allowed"],
+                                  url=permission_infos["url"],
+                                  additional_urls=permission_infos['additional_urls'],
+                                  auth_header=permission_infos['auth_header'],
+                                  label=permission_infos['label'],
+                                  show_tile=permission_infos['show_tile'],
                                   protected=permission_infos["protected"], sync_perm=False)
 
         permission_sync_to_user()
diff --git a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
index b470b7a6f..a9abf3403 100644
--- a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
+++ b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
@@ -41,7 +41,7 @@ class MyMigration(Migration):
             if permission.split('.')[0] in SYSTEM_PERMS:
                 ldap.update('cn=%s,ou=permission' % permission, {
                     'authHeader': ["FALSE"],
-                    'label': [permission.split('.')[0]],
+                    'label': [permission.split('.')[0].title()],
                     'showTile': ["FALSE"],
                     'isProtected': ["TRUE"],
                 })