From e6f2a263bd07d828dd284473f102fad6d5910ff9 Mon Sep 17 00:00:00 2001
From: "m.wachsmuth" <m.wachsmuth@MWACHSMUTH.aditosoftware.local>
Date: Tue, 28 Sep 2021 09:10:04 +0200
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.:
2001003][Beschreibungstext wird nicht WYSIWYG dargestellt]
---
.../entityfields/newactivity/onActionProcess.js | 2 +-
process/ActivityTask_lib/process.js | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/entity/Task_entity/entityfields/newactivity/onActionProcess.js b/entity/Task_entity/entityfields/newactivity/onActionProcess.js
index 2a5fd911e8..fd2bd65950 100644
--- a/entity/Task_entity/entityfields/newactivity/onActionProcess.js
+++ b/entity/Task_entity/entityfields/newactivity/onActionProcess.js
@@ -4,4 +4,4 @@ import("Context_lib");
var subject = vars.get("$field.SUBJECT")
var infoText = vars.get("$field.DESCRIPTION");
-ActivityUtils.createNewActivity(undefined, null, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"), subject, infoText);
\ No newline at end of file
+ActivityUtils.createNewActivity(undefined, null, ContextUtils.getCurrentContextId(), vars.get("$field.TASKID"), subject, infoText, null, null, null, null, null, true);
\ No newline at end of file
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 722d202ca0..f7e68b2581 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -321,6 +321,10 @@ ActivityUtils.makeNoActityFilterConditionSql = function ()
* entryDate of an Visit<br>
* @param {String} pVisitPlanEntryId (optional) <p>
* visitPlanEntryId (needed to set the status of visits in visitPlanning)<br>
+ * @param {Boolean} pInfoIsHtml (optional) <p>
+ * defines if the given info is already html.<br>
+ * If not so it will be converted to html<br>
+ * <p>
* @static
* @example
* var content;
@@ -342,15 +346,16 @@ ActivityUtils.makeNoActityFilterConditionSql = function ()
* $KeywordRegistry.activityDirection$outgoing(),
* [["Letter.docx", content, false]]);
*/
-ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks, pParentContext, pParentId, pSubject, pInfo, pDirection, pDocuments, pCategory, pEntryDate, pVisitPlanEntryId)
+ActivityUtils.createNewActivity = function(pRowId, pAdditionalLinks, pParentContext, pParentId, pSubject, pInfo, pDirection, pDocuments, pCategory, pEntryDate, pVisitPlanEntryId, pInfoIsHtml)
{
var params = {};
+ var infoHtml = pInfoIsHtml || false;
if (pDocuments)
params["PresetDocuments_param"] = JSON.stringify(pDocuments);
if (pSubject)
params["Subject_param"] = pSubject;
if (pInfo)
- params["Info_param"] = text.text2html(pInfo.trim(), false);
+ params["Info_param"] = infoHtml ? pInfo : text.text2html(pInfo.trim(), false) ;
if (pDirection)
params["Direction_param"] = pDirection;
if (pCategory)
--
GitLab