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

Merge branch 'pull/723' into development

Browse source 
# Conflicts:
#	mvis/ivis-core
This commit is contained in:
Tomas Bures 2019-12-07 13:56:49 +01:00
commit 3c4fbf2754
8 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,7 @@ export default class CUD extends Component {
this.eventOptions = {
[Entity.SUBSCRIPTION]: [
{key: SubscriptionEvent.CREATED, label: eventLabels[Entity.SUBSCRIPTION][SubscriptionEvent.CREATED]},
{key: SubscriptionEvent.UPDATED, label: eventLabels[Entity.SUBSCRIPTION][SubscriptionEvent.UPDATED]},
{key: SubscriptionEvent.LATEST_OPEN, label: eventLabels[Entity.SUBSCRIPTION][SubscriptionEvent.LATEST_OPEN]},
{key: SubscriptionEvent.LATEST_CLICK, label: eventLabels[Entity.SUBSCRIPTION][SubscriptionEvent.LATEST_CLICK]}
],

1
client/src/campaigns/triggers/helpers.js
View file

@ -15,6 +15,7 @@ export function getTriggerTypes(t) {
const eventLabels = {
[Entity.SUBSCRIPTION]: {
[SubscriptionEvent.CREATED]: t('created'),
[SubscriptionEvent.UPDATED]: t('updated'),
[SubscriptionEvent.LATEST_OPEN]: t('latestOpen'),
[SubscriptionEvent.LATEST_CLICK]: t('latestClick')
},