From 0c3510d62695e05b58f83da447d6b9564ab12300 Mon Sep 17 00:00:00 2001
From: Tomas Bures <tbures@sathyasai.org>
Date: Mon, 18 Feb 2019 22:42:57 +0000
Subject: [PATCH] Some fixes

---
 locales/en-US/common.json  |  6 +++---
 server/models/campaigns.js | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/locales/en-US/common.json b/locales/en-US/common.json
index cbadc703..72791706 100644
--- a/locales/en-US/common.json
+++ b/locales/en-US/common.json
@@ -332,7 +332,7 @@
   "size": "Size",
   "download": "Download",
   "confirmFileDeletion": "Confirm file deletion",
-  "filesareYouSureToDeleteFile": "files:areYouSureToDeleteFile",
+  "filesareYouSureToDeleteFile": "Are you sure you want to delete the file?",
   "dropCountFile": "Drop {{count}} file",
   "dropCountFile_plural": "Drop {{count}} files",
   "dropFilesHere": "Drop files here",
@@ -353,7 +353,7 @@
   "andMore": "... and more",
   "confirmDeletion": "Confirm Deletion",
   "areYouSureYouWantToDeleteName?": "Are you sure you want to delete \"{{name}}\"?",
-  "namespacemustBeSelected": "namespace.mustBeSelected",
+  "namespacemustBeSelected": "Namespace must be selected",
   "mjml": "MJML",
   "html": "HTML",
   "countEntriesSelected": "{{ count }} entries selected.",
@@ -920,7 +920,7 @@
   "deleteUser": "Delete User",
   "userName-1": "User \"{{name}}\"",
   "shares": "Shares",
-  "subscriptionconfirmed": "subscription.confirmed",
+  "subscriptionconfirmed": "Subscription Confirmed",
   "listEmailAddressAlreadyRegistered": "{{list}}: Email Address Already Registered",
   "listPleaseConfirmEmailChangeIn": "{{list}}: Please Confirm Email Change in Subscription",
   "pleaseConfirmSubscription": "Please Confirm Subscription",
diff --git a/server/models/campaigns.js b/server/models/campaigns.js
index 8e47a9db..f2dc5dff 100644
--- a/server/models/campaigns.js
+++ b/server/models/campaigns.js
@@ -708,9 +708,7 @@ async function _changeStatusByMessageTx(tx, context, message, 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')
             .where('id', message.id)
@@ -726,7 +724,11 @@ async function changeStatusByCampaignCidAndSubscriptionIdTx(tx, context, campaig
     const message = await tx('campaign_messages')
         .innerJoin('campaigns', 'campaign_messages.campaign', 'campaigns.id')
         .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) {
         throw new Error('Invalid campaign.')