From e0d3f6e2c943c382337627e217411c4dacd548be Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Wed, 7 Oct 2020 11:01:13 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1061035][Serienmail
- Testen - Fehler im Serverlog]
---
.../_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
process/Email_lib/process.js | 14 +++++++-------
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5e056b9be7..8b633511b0 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -7269,6 +7269,9 @@
<entry>
<key>Favoritegroup</key>
</entry>
+ <entry>
+ <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index e65b895509..61cbdca201 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -9642,6 +9642,10 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>FavoriteGroup</key>
</entry>
+ <entry>
+ <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+ <value>Mailbridge fehlgeschlagen: Benutzer '%0' ist unbekannt, kontaktieren sie einen Administrator.</value>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 8347bc106b..7b56909fe4 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -7350,6 +7350,9 @@
<entry>
<key>Favoritegroup</key>
</entry>
+ <entry>
+ <key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 46a0698735..4d83ba5711 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -1,3 +1,4 @@
+import("system.question");
import("Sql_lib");
import("MimeType_lib");
import("Document_lib");
@@ -388,17 +389,16 @@ Email.prototype.send = function (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)
+ let mailbridgeExists = newSelect("ASYS_USERS.PROPVAL", SqlUtils.getSystemAlias())
+ .from("ASYS_USERS")
+ .where("ASYS_USERS.PROPVAL", "title")
+ .and("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]));
+ else //check mailbridge user if this error gets thrown
+ question.showMessage(translate.withArguments("Mailbridge failed: user '%0' is unknown, contact an administrator.", [mailbridgeTitle]), question.ERROR, translate.text("Error"));
}
-
// remove from cache
mail.deleteMail(mailId)
return sentMails > 0;
--
GitLab