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

Migration and model for triggers.

Browse source 
Not tested.
This commit is contained in:
Tomas Bures 2018-08-03 21:37:46 +05:30
parent 7b46c4b4b0
commit ffc26a4836
11 changed files with 353 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,8 +41,8 @@ import axios from '../lib/axios';
import styles from "../lib/styles.scss";
import {getUrl} from "../lib/urls";
import {
campaignOverridables,
CampaignSource,
CampaignStatus,
CampaignType
} from "../../../shared/campaigns";
import moment from 'moment';
@ -50,8 +50,6 @@ import {getMailerTypes} from "../send-configurations/helpers";
import {ResourceType} from "../lib/mosaico";
import {getCampaignTypeLabels} from "./helpers";
const overridables = ['from_name', 'from_email', 'reply_to', 'subject'];
@translate()
@withForm
@withPageHelpers
@ -160,7 +158,7 @@ export default class CUD extends Component {
data.useSegmentation = !!data.segment;
for (const overridable of overridables) {
for (const overridable of campaignOverridables) {
data[overridable + '_overriden'] = !!data[overridable + '_override'];
}
@ -169,7 +167,7 @@ export default class CUD extends Component {
} else {
const data = {};
for (const overridable of overridables) {
for (const overridable of campaignOverridables) {
data[overridable + '_override'] = '';
data[overridable + '_overriden'] = false;
}
@ -348,7 +346,7 @@ export default class CUD extends Component {
data.data.feedUrl = data.data_feedUrl;
}
for (const overridable of overridables) {
for (const overridable of campaignOverridables) {
if (!data[overridable + '_overriden']) {
data[overridable + '_override'] = null;
}

1
client/src/campaigns/Content.js
View file

@ -28,7 +28,6 @@ import styles from "../lib/styles.scss";
import {getUrl} from "../lib/urls";
import {ResourceType} from "../lib/mosaico";
const overridables = ['from_name', 'from_email', 'reply_to', 'subject'];
@translate()
@withForm