Merge branch 'cherry-pick-f1d771cc' into '2021.2.1'

Merge branch '2021.2_2001003_newActivity-TaskDescriptionFix_mw' into '2021.2'

See merge request xrm/basic!1412

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

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)