diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index 2c01e234cb59893a1d1cd42da3d6828137dcba9c..494b5d528f0bac0d2135955a873332e8a462641b 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -8,7 +8,7 @@ import("system.result");
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
+ let event = JSON.parse(vars.getString("$param.Entry_param"));
if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
+ let event = JSON.parse(vars.getString("$param.Entry_param"));
result.string(event[calendars.DTSTART]);
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index c7b6ff0bc3c969be63c3338eb60768a41c9d7d20..23262e1a868e63515d37b22d4124b1d79728cc74 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -8,7 +8,7 @@ import("system.result");
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
+ let event = JSON.parse(vars.getString("$param.Entry_param"));
if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
*/
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
+ let event = JSON.parse(vars.getString("$param.Entry_param"));
result.string(event[calendars.DTEND]);
}
\ No newline at end of file
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 3fb6a0dac8ca30a60e8d48d598372683078e9b63..2393fee4b38cea9c67566988bf561a3c8a119949 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -27,6 +27,7 @@ function EmailWritingUtils () {}
* @param {String} [pBindata] base64 binary data
* @param {Array} [pAttachments] attachments in a array (base64 encoded).
* @param {String} pSubject an optional subject.
+ * @param {String} [pEmailFilename] filename of the email.
* @return {Array} the eml document as array with [filename, base64]
*/
EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename)
diff --git a/process/updateActivities_serverProzess/process.js b/process/updateActivities_serverProzess/process.js
index 65cbe7e7042b5872b3d4f9c6067df0227bc0c170..0a952cd68dca8ad315cb606d7aa6f0ef74faf6e4 100644
--- a/process/updateActivities_serverProzess/process.js
+++ b/process/updateActivities_serverProzess/process.js
@@ -3,9 +3,9 @@ import("system.db");
import("Sql_lib");
var activities = new SqlBuilder().select(["ACTIVITY.INFO", "ACTIVITY.ACTIVITYID"]).from("ACTIVITY").where("ACTIVITY.CATEGORY", "MAIL").and("ACTIVITY.INFO", "<%", SqlBuilder.NOT_LIKE()).and("ACTIVITY.INFO","%<html>%", SqlBuilder.LIKE()).table();
-activities.forEach(function (row) {
- let columnsToUpdate = ["INFO"];
- let newValue = row[0].split("<br/>\n").map(function (el)
+activities.forEach(function (row)
+{
+ var newValue = row[0].split("<br/>\n").map(function (el)
{
if (el == "")
return "<br>";
@@ -14,7 +14,6 @@ activities.forEach(function (row) {
else
return "<p>" + el + "</p><br>";
}).join("\n");
- let projectIdCondition = SqlCondition.equals("ACTIVITY.ACTIVITYID", row[1], "1=2");
-
- db.updateData("ACTIVITY", columnsToUpdate, null, [newValue], projectIdCondition);
+ newWhere("ACTIVITY.ACTIVITYID", row[1])
+ .updateFields({"INFO" : newValue});
});
\ No newline at end of file