From c13d4df52137b9428b746ddf42556432e1a0b5c0 Mon Sep 17 00:00:00 2001
From: joker-x <ivan@sinanimodelucro.org>
Date: Sat, 29 Aug 2020 23:04:42 +0200
Subject: [PATCH] Revert to mangeEntity

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

diff --git a/client/src/root.js b/client/src/root.js
index 81909523..e2a5fcd6 100644
--- a/client/src/root.js
+++ b/client/src/root.js
@@ -76,7 +76,7 @@ class Root extends Component {
 		                const entry = topLevelItems[entryKey.toLowerCase()];
 		                const link = entry.link || entry.externalLink;
 
-		                if (superadmin || gP["displayManage"+entryKey]) {
+		                if (superadmin || gP["manage"+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 {
@@ -89,20 +89,20 @@ class Root extends Component {
                         <>
                             <ul className="navbar-nav mt-navbar-nav-left">
                                 {topLevelMenu}
-                                {(superadmin || gP.displayManageUsers || gP.displayManageNamespaces || gP.manageSettings || 
-                                  gP.displayManageSendConfigurations || gP.manageBlacklist || gP.displayManageApi) &&
+                                {(superadmin || gP.manageUsers || gP.manageNamespaces || gP.manageSettings || 
+                                  gP.manageSendConfigurations || gP.manageBlacklist || gP.manageApi) &&
                                   <NavDropdown label={t('administration')}>
-                                    {(superadmin || gP.displayManageUsers) &&
+                                    {(superadmin || gP.manageUsers) &&
                                         <DropdownLink to="/users">{t('users')}</DropdownLink>}
-                                    {(superadmin || gP.displayManageNamespaces) &&
+                                    {(superadmin || gP.manageNamespaces) &&
                                         <DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>}
                                     {(superadmin || gP.manageSettings) &&
                                         <DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>}
-                                    {(superadmin || gP.displayManageSendConfigurations) &&
+                                    {(superadmin || gP.manageSendConfigurations) &&
                                         <DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>}
                                     {(superadmin || gP.manageBlacklist) &&
                                         <DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>}
-                                    {(superadmin || gP.displayManageApi) &&
+                                    {(superadmin || gP.manageApi) &&
                                         <DropdownLink to="/account/api">{t('api')}</DropdownLink>}
                                   </NavDropdown>}
                             </ul>
diff --git a/server/config/default.yaml b/server/config/default.yaml
index f72d961c..46f7727d 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, manageBlacklist, manageSettings, setupAutomation]
+      permissions: [rebuildPermissions, createJavascriptWithROAccess, manageBlacklist, manageSettings,  manageUsers, manageLists, manageChannels, manageTemplates, manageCampaigns, manageReports, manageApi, manageSendConfigurations, manageNamespaces, 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, displayManageLists, displayManageChannels, displayManageTemplates, displayManageCampaigns, displayManageReports, displayManageApi, displayManageSendConfigurations, displayManageNamespaces]
+      permissions: [setupAutomation, manageLists, manageChannels, manageTemplates, manageCampaigns, manageReports, manageApi, manageSendConfigurations, manageNamespaces]
       ownNamespaceRole: campaignsAdmin
     campaignsAdminWithoutNamespace:
       name: Campaigns Admin (multiple namespaces)