From 8f2250bd32e4f465fb65d9f2bbc274d7cb23fd89 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Mon, 21 Sep 2020 08:07:59 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201064455][Dubletten-Integration=20bei=20User:=20ContactId=20w?=
=?UTF-8?q?ird=20nicht=20=C3=BCbertragen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../integratecurrentintoselectedaction/onActionProcess.js | 7 +++++++
.../integrateselectedintocurrentaction/onActionProcess.js | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
index 648ecdcc39..c5025d447a 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.tools");
import("Employee_lib");
import("system.vars");
import("system.neon");
@@ -11,6 +12,12 @@ var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
if(mergeSuccess)
{
+ var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+
+ if (user) {
+ user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+ tools.updateUser(user);
+ }
var currentContactId = EmployeeUtils.getCurrentContactId();
if(currentContactId == null)
currentContactId = "";
diff --git a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
index 651c632fb2..8b4940918a 100644
--- a/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
+++ b/entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.tools");
import("system.db");
import("Employee_lib");
import("KeywordRegistry_basic");
@@ -15,6 +16,12 @@ var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
if(mergeSuccess)
{
+ var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+
+ if (user) {
+ user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+ tools.updateUser(user);
+ }
var currentContactId = EmployeeUtils.getCurrentContactId();
if(currentContactId == null)
currentContactId = "";
--
GitLab