From 3dcc0600cbe809d56c3ca6d878273f163951b50d Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 10 Oct 2019 16:30:05 +0200
Subject: [PATCH] Created Fallback on creation of an merge activity, if there
is no current contact id, an empty string gets used
---
.../integratecurrentintoselectedaction/onActionProcess.js | 3 +++
.../integrateselectedintocurrentaction/onActionProcess.js | 2 ++
.../integratecurrentintoselectedaction/onActionProcess.js | 2 ++
.../integrateselectedintocurrentaction/onActionProcess.js | 2 ++
4 files changed, 9 insertions(+)
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
index 597cd13795..5b61fa56b4 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
@@ -12,6 +12,9 @@ let mergeSuccess = DuplicateScannerUtils.MergeOrganisation(sourceContactId, targ
if(mergeSuccess)
{
let currentContactId = EmployeeUtils.getCurrentContactId();
+ if(currentContactId == null)
+ currentContactId = "";
DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
+
neon.openContext("Organisation", "OrganisationMain_view", [targetContactId], neon.OPERATINGSTATE_VIEW, null)
}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
index 519f845eb2..0e9b9c71d1 100644
--- a/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
@@ -13,6 +13,8 @@ let mergeSuccess = DuplicateScannerUtils.MergeOrganisation(sourceContactId, targ
if(mergeSuccess)
{
let currentContactId = EmployeeUtils.getCurrentContactId();
+ if(currentContactId == null)
+ currentContactId = "";
DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Organisation");
neon.refreshAll();
}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
index bf7678e3b0..d9f980358f 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
@@ -12,6 +12,8 @@ let mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
if(mergeSuccess)
{
let currentContactId = EmployeeUtils.getCurrentContactId();
+ if(currentContactId == null)
+ currentContactId = "";
DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
neon.openContext("Person", "PersonMain_view", [targetContactId], neon.OPERATINGSTATE_VIEW, null)
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
index 69765d3ca5..851ada0af3 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
@@ -17,6 +17,8 @@ let mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
if(mergeSuccess)
{
let currentContactId = EmployeeUtils.getCurrentContactId();
+ if(currentContactId == null)
+ currentContactId = "";
DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
neon.refreshAll();
--
GitLab