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 7acb3c80848f54a4c6dfee5efa7a5b8514dd4a71..0000000000000000000000000000000000000000 --- 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 a8a5e28793c742f8f3e10907976e746faf43c67c..0000000000000000000000000000000000000000 --- 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 7acb3c80848f54a4c6dfee5efa7a5b8514dd4a71..0000000000000000000000000000000000000000 --- 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 dc6dfca332983312b5fc1181f8a357c182ac603f..0000000000000000000000000000000000000000 --- 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 a8a5e28793c742f8f3e10907976e746faf43c67c..0000000000000000000000000000000000000000 --- 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 f5825a6c09c99e0530939a270bcd81cfbc0c2d5b..0000000000000000000000000000000000000000 --- 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 2bf64744b6548030c6db0cb825f376192bfdf5e1..0000000000000000000000000000000000000000 --- 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 f0e8a44adee3749dafae8e5cba1b67c52701e01a..0000000000000000000000000000000000000000 --- 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 a9420fd4fbb060bb56b80f2efa888981a719029e..6f35c476eb9f55b732f36f8bf0a22a9a1cd02921 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 83ad817a1b9487b240e512d26d127e7f2b6a74e8..59bed651862041d08e72db34ad3256cab51d8acc 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 a8645c40d5c729a1546a105048f48020e1369931..94a4ab8ba9daa08c1021663cb1d6435a661e94c7 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 b318e287639603ed313d77088be28239a1b7a6e1..d24d07552af5498326763f378b323980a41d0737 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)