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

Some small updated in UI

Browse source
This commit is contained in:
Tomas Bures 2019-07-31 16:50:06 +02:00
parent dba534ba21
commit ed3ed1a202
4 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/src/campaigns/CUD.js
View file

@ -70,15 +70,19 @@ export default class CUD extends Component {
}; };
this.sourceLabels = { this.sourceLabels = {
[CampaignSource.CUSTOM]: t('customContent'),
[CampaignSource.CUSTOM_FROM_CAMPAIGN]: t('customContentClonedFromAnotherCampaign'),
[CampaignSource.TEMPLATE]: t('template'), [CampaignSource.TEMPLATE]: t('template'),
[CampaignSource.CUSTOM_FROM_TEMPLATE]: t('customContentClonedFromTemplate'), [CampaignSource.CUSTOM_FROM_TEMPLATE]: t('customContentClonedFromTemplate'),
[CampaignSource.CUSTOM_FROM_CAMPAIGN]: t('customContentClonedFromAnotherCampaign'),
[CampaignSource.CUSTOM]: t('customContent'),
[CampaignSource.URL]: t('url') [CampaignSource.URL]: t('url')
}; };
const sourceLabelsOrder = [
CampaignSource.CUSTOM, CampaignSource.CUSTOM_FROM_CAMPAIGN , CampaignSource.TEMPLATE, CampaignSource.CUSTOM_FROM_TEMPLATE, CampaignSource.URL
];
this.sourceOptions = []; this.sourceOptions = [];
for (const key in this.sourceLabels) { for (const key in sourceLabelsOrder) {
this.sourceOptions.push({key, label: this.sourceLabels[key]}); this.sourceOptions.push({key, label: this.sourceLabels[key]});
} }
@ -312,7 +316,7 @@ export default class CUD extends Component {
unsubscribe_url: '', unsubscribe_url: '',
source: CampaignSource.TEMPLATE, source: CampaignSource.CUSTOM,
// This is for CampaignSource.TEMPLATE and CampaignSource.CUSTOM_FROM_TEMPLATE // This is for CampaignSource.TEMPLATE and CampaignSource.CUSTOM_FROM_TEMPLATE
data_sourceTemplate: null, data_sourceTemplate: null,

43
server/config/default.yaml
View file

@ -286,7 +286,7 @@ defaultRoles:
permissions: [view, edit, delete, share, createNamespace, createList, createCustomForm, createReport, createReportTemplate, createTemplate, createMosaicoTemplate, createSendConfiguration, createCampaign, manageUsers] permissions: [view, edit, delete, share, createNamespace, createList, createCustomForm, createReport, createReportTemplate, createTemplate, createMosaicoTemplate, createSendConfiguration, createCampaign, manageUsers]
children: children:
sendConfiguration: [viewPublic, viewPrivate, edit, delete, share, sendWithoutOverrides, sendWithAllowedOverrides, sendWithAnyOverrides] sendConfiguration: [viewPublic, viewPrivate, edit, delete, share, sendWithoutOverrides, sendWithAllowedOverrides, sendWithAnyOverrides]
list: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers] list: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, viewTestSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers]
customForm: [view, edit, delete, share] customForm: [view, edit, delete, share]
campaign: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, fetchRss] campaign: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, fetchRss]
template: [view, edit, delete, share, viewFiles, manageFiles] template: [view, edit, delete, share, viewFiles, manageFiles]
@ -301,7 +301,7 @@ defaultRoles:
permissions: [view, edit, delete, share, createNamespace, createList, createCustomForm, createReport, createTemplate, createMosaicoTemplate, createCampaign] permissions: [view, edit, delete, share, createNamespace, createList, createCustomForm, createReport, createTemplate, createMosaicoTemplate, createCampaign]
children: children:
sendConfiguration: [viewPublic, sendWithoutOverrides, sendWithAllowedOverrides] sendConfiguration: [viewPublic, sendWithoutOverrides, sendWithAllowedOverrides]
list: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers] list: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, viewTestSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers]
customForm: [view, edit, delete, share] customForm: [view, edit, delete, share]
campaign: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, fetchRss] campaign: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, fetchRss]
template: [view, edit, delete, share, viewFiles, manageFiles] template: [view, edit, delete, share, viewFiles, manageFiles]
@ -316,11 +316,21 @@ defaultRoles:
permissions: [view, createTemplate, createCampaign] permissions: [view, createTemplate, createCampaign]
children: children:
sendConfiguration: [viewPublic] sendConfiguration: [viewPublic]
campaign: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, sendToTestUsers, fetchRss] campaign: [view, edit, delete, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, sendToTestUsers, viewStats, fetchRss]
template: [view, edit, delete, share, viewFiles, manageFiles] template: [view, edit, delete, viewFiles, manageFiles]
mosaicoTemplate: [view, viewFiles] mosaicoTemplate: [view, viewFiles]
namespace: [view, createTemplate, createCampaign] namespace: [view, createTemplate, createCampaign]
campaignsViewer:
name: Campaigns Viewer
description: In the respective namespace, the user has permissions to view campaigns and templates in order to be able to replicate them.
permissions: [view, createTemplate, createCampaign]
children:
campaign: [view, viewFiles, viewAttachments, viewTriggers]
template: [view, viewFiles]
mosaicoTemplate: [view, viewFiles]
namespace: [view]
sendConfiguration: sendConfiguration:
master: master:
name: Master name: Master
@ -329,17 +339,17 @@ defaultRoles:
campaignsCreator: campaignsCreator:
name: Campaigns Creator name: Campaigns Creator
description: The user can only use the send configuration in setting up a campaign. However, this gives no permission to send. description: The user can only use the send configuration in setting up a campaign. However, this gives no permission to send.
permissions: [viewPublic] permissions: [viewPublic, sendWithoutOverrides]
list: list:
master: master:
name: Master name: Master
description: All permissions description: All permissions
permissions: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers] permissions: [view, edit, delete, share, viewFields, manageFields, viewSubscriptions, viewTestSubscriptions, manageSubscriptions, viewSegments, manageSegments, viewImports, manageImports, send, sendToTestUsers]
campaignsCreator: campaignsCreator:
name: Campaigns Creator name: Campaigns Creator
description: The user can only use the list in setting up a campaign and to send email to test users. This gives no permission to view subscriptions or to send to the whole list. description: The user can only use the list in setting up a campaign and to send email to test users. This gives no permission to view subscriptions or to send to the whole list.
permissions: [view, viewFields, viewSegments, sendToTestUsers] permissions: [view, viewFields, viewSegments, viewTestSubscriptions, sendToTestUsers]
customForm: customForm:
master: master:
@ -352,10 +362,14 @@ defaultRoles:
name: Master name: Master
description: All permissions description: All permissions
permissions: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, manageMessages, fetchRss] permissions: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, send, sendToTestUsers, viewStats, manageMessages, fetchRss]
campaignsCreator: creator:
name: Campaigns Creator name: Creator
description: The user can setup the campaign but cannot send it. description: The user can setup the campaign but cannot send it.
permissions: [view, edit, delete, share, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, sendToTestUsers, fetchRss] permissions: [view, edit, delete, viewFiles, manageFiles, viewAttachments, manageAttachments, viewTriggers, manageTriggers, sendToTestUsers, viewStats, fetchRss]
viewer:
name: Viewer
description: The user can view the campaign but cannot edit it or send it.
permissions: [view, viewFiles, viewAttachments, viewTriggers]
rssTrigger: rssTrigger:
name: RSS Campaign Trigger name: RSS Campaign Trigger
description: Allows triggering a fetch of an RSS campaign description: Allows triggering a fetch of an RSS campaign
@ -366,6 +380,10 @@ defaultRoles:
name: Master name: Master
description: All permissions description: All permissions
permissions: [view, edit, delete, share, viewFiles, manageFiles] permissions: [view, edit, delete, share, viewFiles, manageFiles]
viewer:
name: Viewer
description: The user can view the template but cannot edit it.
permissions: [view, viewFiles]
report: report:
master: master:
@ -384,9 +402,8 @@ defaultRoles:
name: Master name: Master
description: All permissions description: All permissions
permissions: [view, edit, delete, share, viewFiles, manageFiles] permissions: [view, edit, delete, share, viewFiles, manageFiles]
campaignsCreator: viewer:
name: Campaigns Creator name: Viewer
description: The user can use the Mosaico template, but cannot edit it or delete it. description: The user can use the Mosaico template, but cannot edit it or delete it.
permissions: [view, viewFiles] permissions: [view, viewFiles]

1
server/models/shares.js
View file

@ -171,7 +171,6 @@ async function rebuildPermissionsTx(tx, restriction) {
} }
} }
// Reset root, own and shared namespaces shares as per the user roles // Reset root, own and shared namespaces shares as per the user roles
const usersAutoSharesQry = tx('users') const usersAutoSharesQry = tx('users')
.select(['users.id', 'users.role', 'users.namespace']); .select(['users.id', 'users.role', 'users.namespace']);

2
server/models/subscriptions.js
View file

@ -358,7 +358,7 @@ async function listDTAjax(context, listId, segmentId, params) {
async function listTestUsersDTAjax(context, listCid, params) { async function listTestUsersDTAjax(context, listCid, params) {
return await knex.transaction(async tx => { return await knex.transaction(async tx => {
const list = await lists.getByCidTx(tx, context, listCid); const list = await lists.getByCidTx(tx, context, listCid);
await shares.enforceEntityPermissionTx(tx, context, 'list', list.id, 'viewSubscriptions'); await shares.enforceEntityPermissionTx(tx, context, 'list', list.id, 'viewTestSubscriptions');
const listTable = getSubscriptionTableName(list.id); const listTable = getSubscriptionTableName(list.id);