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({entry.title} {t('current')});
} else {
@@ -89,20 +89,20 @@ class Root extends Component {
<>
{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) &&
- {(superadmin || gP.displayManageUsers) &&
+ {(superadmin || gP.manageUsers) &&
{t('users')}}
- {(superadmin || gP.displayManageNamespaces) &&
+ {(superadmin || gP.manageNamespaces) &&
{t('namespaces')}}
{(superadmin || gP.manageSettings) &&
{t('globalSettings')}}
- {(superadmin || gP.displayManageSendConfigurations) &&
+ {(superadmin || gP.manageSendConfigurations) &&
{t('sendConfigurations')}}
{(superadmin || gP.manageBlacklist) &&
{t('blacklist')}}
- {(superadmin || gP.displayManageApi) &&
+ {(superadmin || gP.manageApi) &&
{t('api')}}
}
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)