From b75139a9171565babc7668ff5e8a55acccbb3bce Mon Sep 17 00:00:00 2001
From: Carolin Wimmer <c.wimmer@adito.de>
Date: Thu, 5 Nov 2020 10:29:19 +0100
Subject: [PATCH] [Projekt: Crowd-Development / Besuch vor Ort][TicketNr.:
1066856][Wochenplanung / Wochenplaneintrag]
---
.../children/newactivity/onActionProcess.js | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
index 5fdb3779fc..cf6d64f699 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
@@ -25,21 +25,8 @@ if(pointOfContact)
links.push([ContactUtils.getContextByContactId(pointOfContact), pointOfContact]);
else
{
- var contactId = vars.get("$field.ORGANISATION_CONTACT_ID");
- context = ContactUtils.getContextByContactId(contactId);
- if(context == 'Person')
- {
- var orgContactId = newSelect("CONTACTID")
- .from("CONTACT")
- .where("PERSON_ID is null")
- .and("CONTACT.ORGANISATION_ID", newSelect("ORGANISATION_ID")
- .from("CONTACT")
- .where("CONTACT.CONTACTID", contactId)
- .cell()).cell();
- if(orgContactId)
- links.push(["Organisation", orgContactId]);
- }
- links.push([context, contactId]);
+ links.push(["Organisation", vars.get("$field.ORGANISATION_CONTACT_ID")]);
+ links.push(["Person", vars.get("$field.CONTACT_ID")]);
}
ActivityUtils.createNewActivity(null, links, null, null, null, null, $KeywordRegistry.activityDirection$outgoing(), null, $KeywordRegistry.activityCategory$visit(), vars.get("$field.ENTRYDATE"), vars.get("$field.UID"));
--
GitLab