diff --git a/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js b/entity/Organisation_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js index 597cd13795bb8284b220d743517bfede1d7cdfe6..5b61fa56b4a367c5d2c80f2d90aa249fa2033b11 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 519f845eb20c37ed76d498ac659859dac9b344ef..0e9b9c71d1fd0afe45f331d3122d07d7de7c4187 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 bf7678e3b0f63c9ad0eebb6904132b9cde2a308c..d9f980358fb5ae885dcbffee0116b9e187a23ff2 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 69765d3ca542f6e779d7c872d3d6bc48aa1ac1e8..851ada0af360d8e89cc23cbfbda7b997ca4bde56 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();