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

Before renaming imports to tasks

Browse source
This commit is contained in:
Tomas Bures 2018-09-23 22:28:58 +02:00
parent a494dc6482
commit 86efa11994
18 changed files with 81 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -559,10 +559,11 @@ export default class CUD extends Component {
const sendConfigurationsColumns = [
{ data: 1, title: t('Name') },
{ data: 2, title: t('Description') },
{ data: 3, title: t('Type'), render: data => this.mailerTypes[data].typeName },
{ data: 4, title: t('Created'), render: data => moment(data).fromNow() },
{ data: 5, title: t('Namespace') }
{ data: 2, title: t('ID'), render: data => <code>{data}</code> },
{ data: 3, title: t('Description') },
{ data: 4, title: t('Type'), render: data => this.mailerTypes[data].typeName },
{ data: 5, title: t('Created'), render: data => moment(data).fromNow() },
{ data: 6, title: t('Namespace') }
];
let sendSettings;

4
client/src/campaigns/triggers/CUD.js
View file

@ -84,7 +84,7 @@ export default class CUD extends Component {
componentDidMount() {
if (this.props.entity) {
this.getFormValuesFromEntity(this.props.entity, data => {
data.daysAfter = (Math.round(data.seconds_after / (3600 * 24))).toString();
data.daysAfter = (Math.round(data.seconds / (3600 * 24))).toString();
if (data.entity === Entity.SUBSCRIPTION) {
data.subscriptionEvent = data.event;
@ -157,7 +157,7 @@ export default class CUD extends Component {
this.setFormStatusMessage('info', t('Saving ...'));
const submitSuccessful = await this.validateAndSendFormValuesToURL(sendMethod, url, data => {
data.seconds_after = Number.parseInt(data.daysAfter) * 3600 * 24;
data.seconds = Number.parseInt(data.daysAfter) * 3600 * 24;
if (data.entity === Entity.SUBSCRIPTION) {
data.event = data.subscriptionEvent;

7
client/src/lists/CUD.js
View file

@ -156,9 +156,10 @@ export default class CUD extends Component {
const sendConfigurationsColumns = [
{ data: 1, title: t('Name') },
{ data: 2, title: t('Description') },
{ data: 3, title: t('Type'), render: data => this.mailerTypes[data].typeName },
{ data: 5, title: t('Namespace') }
{ data: 2, title: t('ID'), render: data => <code>{data}</code> },
{ data: 3, title: t('Description') },
{ data: 4, title: t('Type'), render: data => this.mailerTypes[data].typeName },
{ data: 6, title: t('Namespace') }
];
return (

2
client/src/lists/List.js
View file

@ -96,7 +96,7 @@ export default class List extends Component {
if (perms.includes('viewImports')) {
actions.push({
label: <Icon icon="sort" title={t('Imports')}/>,
label: <Icon icon="sort" title={t('Imports & Tasks')}/>,
link: `/lists/${data[0]}/imports`
});
}

4
client/src/lists/imports/CUD.js
View file

@ -386,7 +386,7 @@ export default class CUD extends Component {
let saveButtonLabel;
if (!isEdit) {
saveButtonLabel = t('Save and edit mapping');
saveButtonLabel = t('Save and edit settings');
} else {
saveButtonLabel = t('Save');
}
@ -404,7 +404,7 @@ export default class CUD extends Component {
deletedMsg={t('Field deleted')}/>
}
<Title>{isEdit ? t('Edit Import') : t('Create Import')}</Title>
<Title>{isEdit ? t('Edit Import/Task') : t('Create Import/Task')}</Title>
<Form stateOwner={this} onSubmitAsync={::this.submitHandler}>
<InputField id="name" label={t('Name')}/>

4
client/src/lists/imports/List.js
View file

@ -81,11 +81,11 @@ export default class List extends Component {
<div>
{mailtrainConfig.globalPermissions.includes('setupAutomation') && this.props.list.permissions.includes('manageImports') &&
<Toolbar>
<NavButton linkTo={`/lists/${this.props.list.id}/imports/create`} className="btn-primary" icon="plus" label={t('Create Import')}/>
<NavButton linkTo={`/lists/${this.props.list.id}/imports/create`} className="btn-primary" icon="plus" label={t('Create Import/Task')}/>
</Toolbar>
}
<Title>{t('Imports')}</Title>
<Title>{t('Imports & Tasks')}</Title>
<Table withHeader dataUrl={`rest/imports-table/${this.props.list.id}`} columns={columns} />
</div>

2
client/src/lists/root.js
View file

@ -132,7 +132,7 @@ function getMenus(t) {
}
},
imports: {
title: t('Imports'),
title: t('Imports & Tasks'),
link: params => `/lists/${params.listId}/imports/`,
visible: resolved => resolved.list.permissions.includes('viewImports'),
panelRender: props => <ImportsList list={props.resolved.list} />,