public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert to mangeEntity

Browse source
This commit is contained in:
joker-x 2020-08-29 23:04:42 +02:00
parent 2e07e2442d
commit c13d4df521
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/src/root.js
View file

@ -76,7 +76,7 @@ class Root extends Component {
const entry = topLevelItems[entryKey.toLowerCase()]; const entry = topLevelItems[entryKey.toLowerCase()];
const link = entry.link || entry.externalLink; const link = entry.link || entry.externalLink;
if (superadmin || gP["displayManage"+entryKey]) { if (superadmin || gP["manage"+entryKey]) {
if (link && path.startsWith(link)) { 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>); topLevelMenu.push(<NavLink key={entryKey.toLowerCase()} className="active" to={link}>{entry.title} <span className="sr-only">{t('current')}</span></NavLink>);
} else { } else {
@ -89,20 +89,20 @@ class Root extends Component {
<> <>
<ul className="navbar-nav mt-navbar-nav-left"> <ul className="navbar-nav mt-navbar-nav-left">
{topLevelMenu} {topLevelMenu}
{(superadmin || gP.displayManageUsers || gP.displayManageNamespaces || gP.manageSettings || {(superadmin || gP.manageUsers || gP.manageNamespaces || gP.manageSettings ||
gP.displayManageSendConfigurations || gP.manageBlacklist || gP.displayManageApi) && gP.manageSendConfigurations || gP.manageBlacklist || gP.manageApi) &&
<NavDropdown label={t('administration')}> <NavDropdown label={t('administration')}>
{(superadmin || gP.displayManageUsers) && {(superadmin || gP.manageUsers) &&
<DropdownLink to="/users">{t('users')}</DropdownLink>} <DropdownLink to="/users">{t('users')}</DropdownLink>}
{(superadmin || gP.displayManageNamespaces) && {(superadmin || gP.manageNamespaces) &&
<DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>} <DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>}
{(superadmin || gP.manageSettings) && {(superadmin || gP.manageSettings) &&
<DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>} <DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>}
{(superadmin || gP.displayManageSendConfigurations) && {(superadmin || gP.manageSendConfigurations) &&
<DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>} <DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>}
{(superadmin || gP.manageBlacklist) && {(superadmin || gP.manageBlacklist) &&
<DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>} <DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>}
{(superadmin || gP.displayManageApi) && {(superadmin || gP.manageApi) &&
<DropdownLink to="/account/api">{t('api')}</DropdownLink>} <DropdownLink to="/account/api">{t('api')}</DropdownLink>}
</NavDropdown>} </NavDropdown>}
</ul> </ul>

4
server/config/default.yaml
View file

@ -277,12 +277,12 @@ defaultRoles:
name: Global Master name: Global Master
admin: true admin: true
description: All permissions 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 rootNamespaceRole: master
campaignsAdmin: campaignsAdmin:
name: Campaigns Admin 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. 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 ownNamespaceRole: campaignsAdmin
campaignsAdminWithoutNamespace: campaignsAdminWithoutNamespace:
name: Campaigns Admin (multiple namespaces) name: Campaigns Admin (multiple namespaces)