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

Change permissions names from manageXXX to displayManageXXX, except manageSettings and manageBlacklist

Browse source
This commit is contained in:
joker-x 2020-08-27 21:08:01 +02:00
parent ead7bbf9dd
commit 781f312467
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/root.js
View file

@ -73,7 +73,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 (mailtrainConfig.user.admin || mailtrainConfig.globalPermissions["manage"+entryKey]) { if (mailtrainConfig.user.admin || mailtrainConfig.globalPermissions["displayManage"+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 {
@ -87,17 +87,17 @@ class Root extends Component {
<ul className="navbar-nav mt-navbar-nav-left"> <ul className="navbar-nav mt-navbar-nav-left">
{topLevelMenu} {topLevelMenu}
<NavDropdown label={t('administration')}> <NavDropdown label={t('administration')}>
{(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageUsers) && {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageUsers) &&
<DropdownLink to="/users">{t('users')}</DropdownLink>} <DropdownLink to="/users">{t('users')}</DropdownLink>}
{(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageNamespaces) && {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.displayManageNamespaces) &&
<DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>} <DropdownLink to="/namespaces">{t('namespaces')}</DropdownLink>}
{(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageSettings) && {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageSettings) &&
<DropdownLink to="/settings">{t('globalSettings')}</DropdownLink>} <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>} <DropdownLink to="/send-configurations">{t('sendConfigurations')}</DropdownLink>}
{(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageBlacklist) && {(mailtrainConfig.user.admin || mailtrainConfig.globalPermissions.manageBlacklist) &&
<DropdownLink to="/blacklist">{t('blacklist')}</DropdownLink>} <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>} <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, manageUsers, manageBlacklist, manageSettings, setupAutomation] permissions: [rebuildPermissions, createJavascriptWithROAccess, manageBlacklist, manageSettings, 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, manageLists, manageChannels, manageTemplates, manageCampaigns, manageReports, manageApi, manageSendConfigurations, manageNamespaces] permissions: [setupAutomation, displayManageLists, displayManageChannels, displayManageTemplates, displayManageCampaigns, displayManageReports, displayManageApi, displayManageSendConfigurations, displayManageNamespaces]
ownNamespaceRole: campaignsAdmin ownNamespaceRole: campaignsAdmin
campaignsAdminWithoutNamespace: campaignsAdminWithoutNamespace:
name: Campaigns Admin (multiple namespaces) name: Campaigns Admin (multiple namespaces)