From 7a4fefafca4148f7e100a62142e5d7d9e2132569 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Wed, 7 Oct 2020 10:06:01 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1061035][Serienmail
- Testen - Fehler im Serverlog]
---
.liquibase/Data_alias/changelog.xml | 2 +-
process/Email_lib/process.js | 21 +++++++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index c3a1d3c575..8b0160a2bd 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -18,5 +18,5 @@
<include relativeToChangelogFile="true" file="basic/2020.2.0/changelog.xml"/>
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
- <!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
+ <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 373495625a..46a0698735 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -380,8 +380,25 @@ Email.prototype.send = function (pUser)
if (this.sender)
mail.setSender(mailId, this.sender);
-
- var sentMails = mail.sendMailAs(pUser || "mailbridge", mailId)
+ var mailbridgeTitle = "mailbridge";
+
+
+ var sentMails;
+ if(pUser)
+ sentMails = mail.sendMailAs(pUser, mailId)
+ else
+ {
+ let mailbridgeExists = newSelect("ADITO.ASYS_USERS.PROPVAL")
+ .from("ADITO.ASYS_USERS")
+ .where("ADITO.ASYS_USERS.PROPVAL", "title")
+ .and("ADITO.ASYS_USERS.PROPVAL", mailbridgeTitle)
+ .cell();
+ if(mailbridgeExists)
+ mail.sendMailAs(mailbridgeTitle, mailId)
+ else
+ throw new Error(translate.withArguments("Mailbridge failed, user %0 is unknown, contact an administrator.", [mailbridgeTitle]));
+ }
+
// remove from cache
mail.deleteMail(mailId)
return sentMails > 0;
--
GitLab