From 6fd9239653b0b4dc555d66833cf9c20e8ee2132d Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Wed, 23 Oct 2019 08:54:04 +0200
Subject: [PATCH] Bulkmail_lib fix
---
.../Employee_entity/recordcontainers/jdito/contentProcess.js | 2 +-
process/Bulkmail_lib/process.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 048079355f..330c111dda 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -51,7 +51,7 @@ var names = [];
for (let begin = 0, max = contactIds.length; begin < max; begin += idsPerPage)
{
- names = names.concat(newSelect("CONTACTID, " + selectExpression)
+ names = names.concat(newSelect(["CONTACTID", selectExpression])
.from("CONTACT")
.leftJoin("PERSON", "(PERSON.PERSONID = CONTACT.PERSON_ID)")
.whereIfSet("CONTACT.CONTACTID", contactIds.slice(begin, begin + idsPerPage), SqlBuilder.IN())
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 9318128f13..243a9e86c4 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -122,11 +122,11 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
}
}
- newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds, SqlBuilder.In())
+ newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds, SqlBuilder.IN())
.updateData(true, "BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate]);
- newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds, SqlBuilder.In())
+ newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds, SqlBuilder.IN())
.updateData(true, "BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$failed(), sentDate]);
if (!pTestRecipients) //if its just a test run, don't set the status to sent
--
GitLab