From 781f312467b13048900770ceb8cb539d6f889ff4 Mon Sep 17 00:00:00 2001
From: joker-x <ivan@sinanimodelucro.org>
Date: Thu, 27 Aug 2020 21:08:01 +0200
Subject: [PATCH] Change permissions names from manageXXX to displayManageXXX,
 except manageSettings and manageBlacklist

---
 client/src/root.js         | 10 +++++-----
 server/config/default.yaml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/root.js b/client/src/root.js
index 87944375..80f8b019 100644
--- a/client/src/root.js
+++ b/client/src/root.js
@@ -73,7 +73,7 @@ class Root extends Component {
 		                const entry = topLevelItems[entryKey.toLowerCase()];
 		                const link = entry.link || entry.externalLink;
 
-		                if (mailtrainConfig.user.admin || mailtrainConfig.globalPermissions["manage"+entryKey]) {
+		                if (mailtrainConfig.user.admin || mailtrainConfig.globalPermissions["displayManage"+entryKey]) {
 		                    if (link && path.startsWith(link)) {
 		                        topLevelMenu.push(<NavLink key={entryKey.toLowerCase()} className="active" to={link}>{entry.title} <span className="sr-only">{t('current')}</span></NavLink>);
 		                    } else {
@@ -87,17 +87,17 @@ class Root extends Component {
                             <ul className="navbar-nav mt-navbar-nav-left">
                                 {topLevelMenu}
                                 <NavDropdown label={t('administration')}>
-                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageUsers) &&
+                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageUsers) &&
                                         <DropdownLink to="/users">{t('users')}</DropdownLink>}
-                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageNamespaces) &&
+                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageNamespaces) &&
                                         <DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>}
                                     {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageSettings) &&
                                         <DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>}
-                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageSendConfigurations) &&
+                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageSendConfigurations) &&
                                         <DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>}
                                     {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageBlacklist) &&
                                         <DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>}
-                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageApi) &&
+                                    {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageApi) &&
                                         <DropdownLink to="/account/api">{t('api')}</DropdownLink>}
                                 </NavDropdown>
                             </ul>
diff --git a/server/config/default.yaml b/server/config/default.yaml
index 037bf9e3..f72d961c 100644
--- a/server/config/default.yaml
+++ b/server/config/default.yaml
@@ -277,12 +277,12 @@ defaultRoles:
       name: Global Master
       admin: true
       description: All permissions
-      permissions: [rebuildPermissions, createJavascriptWithROAccess, manageUsers, manageBlacklist, manageSettings, setupAutomation]
+      permissions: [rebuildPermissions, createJavascriptWithROAccess, manageBlacklist, manageSettings, setupAutomation]
       rootNamespaceRole: master
     campaignsAdmin:
       name: Campaigns Admin
       description: Under the namespace in which the user is located, the user has all permissions for managing lists, templates and campaigns and the permission to send to send configurations.
-      permissions: [setupAutomation, manageLists, manageChannels, manageTemplates, manageCampaigns, manageReports, manageApi, manageSendConfigurations, manageNamespaces]
+      permissions: [setupAutomation, displayManageLists, displayManageChannels, displayManageTemplates, displayManageCampaigns, displayManageReports, displayManageApi, displayManageSendConfigurations, displayManageNamespaces]
       ownNamespaceRole: campaignsAdmin
     campaignsAdminWithoutNamespace:
       name: Campaigns Admin (multiple namespaces)