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

Some fixes

Browse source
This commit is contained in:
Tomas Bures 2019-02-18 22:42:57 +00:00
parent 8d95f43dbc
commit 0c3510d626
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
locales/en-US/common.json
View file

@ -332,7 +332,7 @@
"size": "Size", "size": "Size",
"download": "Download", "download": "Download",
"confirmFileDeletion": "Confirm file deletion", "confirmFileDeletion": "Confirm file deletion",
"filesareYouSureToDeleteFile": "files:areYouSureToDeleteFile", "filesareYouSureToDeleteFile": "Are you sure you want to delete the file?",
"dropCountFile": "Drop {{count}} file", "dropCountFile": "Drop {{count}} file",
"dropCountFile_plural": "Drop {{count}} files", "dropCountFile_plural": "Drop {{count}} files",
"dropFilesHere": "Drop files here", "dropFilesHere": "Drop files here",
@ -353,7 +353,7 @@
"andMore": "... and more", "andMore": "... and more",
"confirmDeletion": "Confirm Deletion", "confirmDeletion": "Confirm Deletion",
"areYouSureYouWantToDeleteName?": "Are you sure you want to delete \"{{name}}\"?", "areYouSureYouWantToDeleteName?": "Are you sure you want to delete \"{{name}}\"?",
"namespacemustBeSelected": "namespace.mustBeSelected", "namespacemustBeSelected": "Namespace must be selected",
"mjml": "MJML", "mjml": "MJML",
"html": "HTML", "html": "HTML",
"countEntriesSelected": "{{ count }} entries selected.", "countEntriesSelected": "{{ count }} entries selected.",
@ -920,7 +920,7 @@
"deleteUser": "Delete User", "deleteUser": "Delete User",
"userName-1": "User \"{{name}}\"", "userName-1": "User \"{{name}}\"",
"shares": "Shares", "shares": "Shares",
"subscriptionconfirmed": "subscription.confirmed", "subscriptionconfirmed": "Subscription Confirmed",
"listEmailAddressAlreadyRegistered": "{{list}}: Email Address Already Registered", "listEmailAddressAlreadyRegistered": "{{list}}: Email Address Already Registered",
"listPleaseConfirmEmailChangeIn": "{{list}}: Please Confirm Email Change in Subscription", "listPleaseConfirmEmailChangeIn": "{{list}}: Please Confirm Email Change in Subscription",
"pleaseConfirmSubscription": "Please Confirm Subscription", "pleaseConfirmSubscription": "Please Confirm Subscription",

10
server/models/campaigns.js
View file

@ -708,9 +708,7 @@ async function _changeStatusByMessageTx(tx, context, message, subscriptionStatus
const statusField = statusFieldMapping[subscriptionStatus]; const statusField = statusFieldMapping[subscriptionStatus];
if (message.status === SubscriptionStatus.SUBSCRIBED) { await tx('campaigns').increment(statusField, 1).where('id', message.campaign);
await tx('campaigns').increment(statusField, 1).where('id', message.campaign);
}
await tx('campaign_messages') await tx('campaign_messages')
.where('id', message.id) .where('id', message.id)
@ -726,7 +724,11 @@ async function changeStatusByCampaignCidAndSubscriptionIdTx(tx, context, campaig
const message = await tx('campaign_messages') const message = await tx('campaign_messages')
.innerJoin('campaigns', 'campaign_messages.campaign', 'campaigns.id') .innerJoin('campaigns', 'campaign_messages.campaign', 'campaigns.id')
.where('campaigns.cid', campaignCid) .where('campaigns.cid', campaignCid)
.where({subscription: subscriptionId, list: listId}); .where({subscription: subscriptionId, list: listId})
.select([
'campaign_messages.id', 'campaign_messages.campaign', 'campaign_messages.list', 'campaign_messages.subscription', 'campaign_messages.status'
])
.first();
if (!message) { if (!message) {
throw new Error('Invalid campaign.') throw new Error('Invalid campaign.')