From 1e23108d3c090b39063817a0010e522dfd19aad2 Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Mon, 25 May 2020 12:02:16 +0000
Subject: [PATCH] 1056496 fix appointment link task activity
---
entity/Activity_entity/Activity_entity.aod | 6 ++++++
entity/Object_entity/Object_entity.aod | 16 ++++++++++++++++
.../recordcontainers/jdito/contentProcess.js | 2 +-
entity/Task_entity/Task_entity.aod | 8 ++++++++
entity/Task_entity/contentTitleProcess.js | 2 +-
process/Context_lib/process.js | 4 ++++
6 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index b5ebf375b2..0d0a112f0c 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -87,6 +87,12 @@
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>262fe53d-7358-40ff-8641-e08add14528a</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Activities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index ea690ba4a9..2d1e2ff409 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -255,6 +255,22 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 959e539e3f..67b5e68f5a 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,7 @@ import("Context_lib");
// NOTE THAT THIS ENTITY USES THE TARGET_CONSUMER_PROCESSES OF THE PROVIDERS
-// --> THIS PROCESS WON'T NOT BE EXECUTED IN SOME CASES.
+// --> THIS PROCESS WON'T BE EXECUTED IN SOME CASES.
if (vars.get("$param.ObjectType_param"))
{
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 28aaf1ff3a..0be99b99ff 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -16,6 +16,14 @@
<entityProvider>
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7a20f989-4c0a-40aa-9092-6ea9e99e851e</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>SUBJECT</name>
diff --git a/entity/Task_entity/contentTitleProcess.js b/entity/Task_entity/contentTitleProcess.js
index 42200983cd..f52078612d 100644
--- a/entity/Task_entity/contentTitleProcess.js
+++ b/entity/Task_entity/contentTitleProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.TYPE.displayValue"))
\ No newline at end of file
+result.string(vars.get("$field.SUBJECT"))
\ No newline at end of file
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 9baeb09edf..59bed65186 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -145,6 +145,10 @@ ContextUtils.getContextConsumer = function(pContextId)
return "PrivatePersons";
case ContextUtils.getContextName("Leadimport"):
return "Leadimport";
+ case ContextUtils.getContextName("Task"):
+ return "Tasks";
+ case ContextUtils.getContextName("Activity"):
+ return "Activities";
default:
throw new Error(translate.withArguments("No consumer found for context '%0'", [pContextId]));
}
--
GitLab