merged origin/2020.0.0 into 1042982_belegInsLog

entity/360Degree_entity/360Degree_entity.aod

@@ -47,6 +47,10 @@
           <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js</valueProcess>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>BaseContextId_param</name>
+          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/organisationobjects/children/basecontextid_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -86,6 +90,10 @@
           <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js</valueProcess>
           <expose v="false" />
         </entityParameter>
+        <entityParameter>
+          <name>BaseContextId_param</name>
+          <valueProcess>%aditoprj%/entity/360Degree_entity/entityfields/personobjects/children/basecontextid_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityProvider>
     <entityField>
@@ -156,6 +164,10 @@
       <groupable v="true" />
       <dropDownProcess>%aditoprj%/entity/360Degree_entity/entityfields/active/dropDownProcess.js</dropDownProcess>
     </entityField>
+    <entityParameter>
+      <name>BaseContextId_param</name>
+      <expose v="true" />
+    </entityParameter>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/360Degree_entity/entityfields/newmodule/children/newcampaignparticipant/onActionProcess.js

@@ -5,5 +5,5 @@ if (vars.get("$param.BaseContextId_param") == "Person" || vars.get("$param.BaseC
 {
     // Note: this only works if the BaseContextId_param is also the correct Tablename. If not you have to add a context - tablename mapping somewhere...
     // for person / organisation this should work
-    CampaignUtils.addParticipantsByRowIds(JSON.stringify([vars.getString("$param.ObjectRowId_param")]), vars.get("$param.BaseContextId_param").toUpperCase());
+    CampaignUtils.addParticipantsByRowIds(JSON.stringify([JSON.parse(vars.get("$param.ObjectRowId_param"))[0]]), vars.get("$param.BaseContextId_param").toUpperCase());
 }
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js

 import("system.vars");
 import("Contract_lib");
 
-ContractUtils.createNewContract(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
+ContractUtils.createNewContract(JSON.parse(vars.getString("$param.ObjectRowId_param"))[0]);
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/newoffer/onActionProcess.js

 import("system.vars");
 import("Offer_lib");
 
-OfferUtils.createNewOffer(null, null, vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
+OfferUtils.createNewOffer(null, null, JSON.parse(vars.getString("$param.ObjectRowId_param"))[0]);
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/neworder/onActionProcess.js

 import("system.vars");
 import("Order_lib");
 
-OrderUtils.createNewOrder(null, vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
+OrderUtils.createNewOrder(null, null, JSON.parse(vars.get("$param.ObjectRowId_param"))[0]);

entity/360Degree_entity/entityfields/newmodule/children/newsalesproject/onActionProcess.js

 import("system.vars");
 import("Salesproject_lib");
 
-Salesproject.createNewSalesproject(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
+Salesproject.createNewSalesproject(JSON.parse(vars.getString("$param.ObjectRowId_param"))[0]);
\ No newline at end of file

entity/360Degree_entity/entityfields/newmodule/children/newsupportticket/onActionProcess.js

@@ -3,4 +3,4 @@ import("ActivityTask_lib");
 import("Context_lib");
 import("Ticket_lib")
 
-TicketUtils.createNewTicket(undefined, [[vars.get("$param.BaseContextId_param"), vars.get("$param.ObjectRowId_param")]])
\ No newline at end of file
+TicketUtils.createNewTicket(undefined, [[vars.get("$param.BaseContextId_param"), JSON.parse(vars.get("$param.ObjectRowId_param"))[0]]])
\ No newline at end of file

entity/360Degree_entity/entityfields/organisationobjects/children/basecontextid_param/valueProcess.js

+import("system.result");
+
+result.string("Organisation");
\ No newline at end of file

entity/360Degree_entity/entityfields/personobjects/children/basecontextid_param/valueProcess.js

+import("system.result");
+
+result.string("Person");
\ No newline at end of file

entity/BulkMail_entity/entityfields/content/contentTypeProcess.js

@@ -5,6 +5,6 @@ import("Document_lib");
 import("system.vars");
 import("DocumentTemplate_lib");
 
-result.string(vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT
+result.string(vars.exists("$context.currentTemplateType") && vars.get("$context.currentTemplateType") == DocumentTemplate.types.TXT
     ? "LONG_TEXT" 
     : "HTML");
\ No newline at end of file

entity/BulkMail_entity/entityfields/content/displayValueProcess.js

@@ -8,7 +8,7 @@ import("system.neon");
 import("DocumentTemplate_lib");
 
 // if this was done for every row, like in a lookup, the performance would be very bad
-if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET) 
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$field.content")) 
 {
     var template = new DocumentTemplate(util.encodeBase64String(vars.get("$field.content")), vars.get("$context.currentTemplateType"), undefined, true)
     

entity/BulkMail_entity/entityfields/content/stateProcess.js

@@ -4,7 +4,7 @@ import("system.neon");
 import("DocumentTemplate_lib");
 
 // in edit mode
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && 
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && vars.exists("$context.currentTemplateType") &&
     (vars.get("$context.currentTemplateType") == DocumentTemplate.types.EML
       || vars.get("$context.currentTemplateType") == DocumentTemplate.types.HTML)) // TODO: invisible for html as there are problems with images which are removed by the html-editor
 {

entity/BulkMail_entity/entityfields/content/valueProcess.js

@@ -9,14 +9,17 @@ import("Bulkmail_lib");
 
 if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$this.value") == null)
 {
-    var template = BulkMailUtils.getBulkMailTemplate(vars.get("$field.BULKMAILID"), vars.get("$field.DOCUMENTTEMPLATE_ID"), false, new FileUpload(vars.get("$field.bindata")))
-    var content = util.decodeBase64String(template.content);
-    var type = template.type;
-    vars.set("$context.currentTemplateType", type);
-    result.string(content);
+    var template = BulkMailUtils.getBulkMailTemplate(vars.get("$field.BULKMAILID"), vars.get("$field.DOCUMENTTEMPLATE_ID"), false, false, new FileUpload(vars.get("$field.bindata")));
+    if (template.type)
+    {
+        var content = util.decodeBase64String(template.content);
+        var type = template.type;
+        vars.set("$context.currentTemplateType", type);
+        result.string(content);
+    }
 } 
 else if (!vars.get("$field.DOCUMENTTEMPLATE_ID"))
 {
     result.string("");
     vars.set("$context.currentTemplateType", "");
-}
\ No newline at end of file
+}

entity/BulkMail_entity/entityfields/name/valueProcess.js

@@ -12,7 +12,7 @@ if (!vars.get("$this.value") && vars.get("$sys.recordstate") == neon.OPERATINGST
         var filename = DocumentUtil.getFilenameFromUpload(upload);
         result.string(filename.split(".")[0]);
     }
-    else
+    else if (vars.get("$field.DOCUMENTTEMPLATE_ID"))
     {
         var conf = entities.createConfigForLoadingRows();
         conf.entity("DocumentTemplate_entity")

entity/BulkMail_entity/recordcontainers/db/onDBInsert.js

@@ -20,7 +20,7 @@ var bulkMailName = rowdata["BULKMAIL.NAME"];
 
 var template = DocumentTemplate.getSelectedTemplate(templateId, new FileUpload(bindata), content, DocumentTemplate.types.HTML);
 
-if (template && template.content)
+if (template && template.content && BulkMailUtils.isValidTemplateType(template.type))
 {
     if (!template.filename)
         template.filename = bulkMailName + ".html";

entity/BulkMail_entity/recordcontainers/db/onDBUpdate.js

@@ -20,7 +20,7 @@ var bulkMailName = rowdata["BULKMAIL.NAME"];
 
 var template = DocumentTemplate.getSelectedTemplate(templateId, new FileUpload(bindata), content, DocumentTemplate.types.HTML);
 
-if (template && template.content)
+if (template && template.content && BulkMailUtils.isValidTemplateType(template.type))
 {
     if (!template.filename)
         template.filename = bulkMailName + ".html";

entity/DSGVOInfo_entity/DSGVOInfo_entity.aod

@@ -23,6 +23,7 @@
       <consumer>KeywordGuarantee</consumer>
       <mandatoryProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/mandatoryProcess.js</mandatoryProcess>
       <stateProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/stateProcess.js</stateProcess>
+      <displayValueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>DATASOURCE</name>
@@ -112,6 +113,7 @@
       <title>Transmission</title>
       <consumer>KeywordTransmission</consumer>
       <mandatory v="true" />
+      <displayValueProcess>%aditoprj%/entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js</displayValueProcess>
       <onValueChange>%aditoprj%/entity/DSGVOInfo_entity/entityfields/transmission/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>

entity/DSGVOInfo_entity/entityfields/guarantee/displayValueProcess.js

+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoGuarantee(), vars.get("$field.GUARANTEE")));

entity/DSGVOInfo_entity/entityfields/transmission/displayValueProcess.js

+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.dsgvoTransmission(), vars.get("$field.TRANSMISSION")));

entity/DSGVOInfo_entity/recordcontainers/db/recordfieldmappings/guarantee.displayvalue/expression.js

-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.dsgvoGuarantee(), "DSGVOINFO.GUARANTEE");
-result.string(sql);
+//temporarly removed since this process woul'd cause problems when generating an GDPR report //TODO: reenable this process
\ No newline at end of file