From 7a406720e041e845a00ea2b1c9b4f3b77da27233 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 24 Jul 2020 10:21:09 +0200
Subject: [PATCH] Some Scan Service problems fixed
---
.../entityfields/date_new/valueProcess.js | 6 ------
.../entityfields/user_new/valueProcess.js | 6 ------
.../entityfields/date_new/valueProcess.js | 6 ------
.../children/containername_param/valueProcess.js | 5 -----
.../entityfields/user_new/valueProcess.js | 6 ------
.../children/contactid_param/valueProcess.js | 4 ----
.../entityfields/selectedcampaign/onValueChange.js | 4 ----
.../state.displayvalue/expression.js | 6 ------
entity/Campaign_entity/Campaign_entity.aod | 4 ----
process/Context_lib/process.js | 14 --------------
process/Email_lib/process.js | 2 ++
process/JditoFilter_lib/process.js | 2 +-
12 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
delete mode 100644 entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
delete mode 100644 entity/Attribute_entity/entityfields/date_new/valueProcess.js
delete mode 100644 entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
delete mode 100644 entity/Attribute_entity/entityfields/user_new/valueProcess.js
delete mode 100644 entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
delete mode 100644 entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
delete mode 100644 entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
diff --git a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c8084..0000000000
--- a/entity/AttributeUsage_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js b/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793..0000000000
--- a/entity/AttributeUsage_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/date_new/valueProcess.js b/entity/Attribute_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 7acb3c8084..0000000000
--- a/entity/Attribute_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.date"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js b/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
deleted file mode 100644
index dc6dfca332..0000000000
--- a/entity/Attribute_entity/entityfields/keywordattributetype/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.attributeType());
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/user_new/valueProcess.js b/entity/Attribute_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index a8a5e28793..0000000000
--- a/entity/Attribute_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js b/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
deleted file mode 100644
index f5825a6c09..0000000000
--- a/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.getString("$field.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
deleted file mode 100644
index 2bf64744b6..0000000000
--- a/entity/CampaignParticipant_entity/entityfields/selectedcampaign/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.neon");
-
-
-neon.setFieldValue("$field.SYSTEMTEMPLATE", templateId);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
deleted file mode 100644
index f0e8a44ade..0000000000
--- a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.campaignStepState(), "CAMPAIGNSTEP.STATUS");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index a9420fd4fb..6f35c476eb 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -624,10 +624,6 @@
<name>CURRENCY.displayValue</name>
<expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT.value</name>
- <expression>%aditoprj%/entity/Campaign_entity/recordcontainers/db/recordfieldmappings/count.value/expression.js</expression>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>COUNT_aggregate.value</name>
<recordfield>CAMPAIGN.CAMPAIGNID</recordfield>
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 83ad817a1b..59bed65186 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -593,20 +593,6 @@ ContextUtils.getSelectMap = function()
$KeywordRegistry.taskStatus$customerChecks(),
])
.setCreationDateField("TASK.START_DATE")
- ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT")
- .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID left join TASKLINK on TASKLINK.TASK_ID = TASK.TASKID")
- .setCondition(newWhere("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket()))
- .setContactIdField("TASKLINK.OBJECT_ROWID")
- .setStateField("TASK.STATUS")
- .setActiveStates([
- $KeywordRegistry.taskStatus$new(),
- $KeywordRegistry.taskStatus$unassigned(),
- $KeywordRegistry.taskStatus$assigned(),
- $KeywordRegistry.taskStatus$inProgress(),
- $KeywordRegistry.taskStatus$waiting(),
- $KeywordRegistry.taskStatus$customerChecks(),
- ])
- .setCreationDateField("TASK.START_DATE")
,"BulkMail" : ContextSelector.create("BULKMAIL", "BULKMAILID", "NAME")
,"SerialLetter" : ContextSelector.create("SERIALLETTER", "SERIALLETTERID", "TITLE")
,"Leadimport": ContextSelector.create("LEADIMPORT", "LEADIMPORTID")
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index a8645c40d5..94a4ab8ba9 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -28,6 +28,7 @@ function EmailWritingUtils () {}
* @param {Array} [pAttachments] attachments in a array (base64 encoded).
* @param {String} pSubject an optional subject.
* @param {String} [pEmailFilename] filename of the email.
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
* @return {Array} the eml document as array with [filename, base64]
*/
EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId, pBindata, pAttachments, pSubject, pEmailFilename, pAdditionalPlaceholders)
@@ -169,6 +170,7 @@ Email.fromRFC = function (pBase64RFC)
* @param {String} [pTemplateId] UUID of the explicit template which shall used. (optional)
* @param {String} [pContactId] (required)
* @param {String} [pBindata] (required)
+ * @param {Placeholder[]} [pAdditionalPlaceholders] additional placeholders
* @return {Email} a new Email object
*/
Email.fromTemplate = function (pTemplateId, pContactId, pBindata, pAdditionalPlaceholders)
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index b318e28763..d24d07552a 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -306,7 +306,7 @@ FilterSqlTranslator.prototype.table = function (pTable, pTableAlias)
* Adds a special database field mapping for the given field that will be used for the sql condition
*
* @param {String} pFieldName the field name
- * @param {String|String[]} the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
+ * @param {String|String[]} pDBField the database field ("TABLE.COLUMN" or ["TABLE", "COLUMN", "alias"])
* @return {FilterSqlTranslator} current object
*/
FilterSqlTranslator.prototype.addSqlFieldMapping = function (pFieldName, pDBField)
--
GitLab