From bde39a6ec2a1c2aa82f7e99898f3e9cef853832e Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 14 Jun 2019 12:00:35 +0200
Subject: [PATCH] =?UTF-8?q?Siblings=20wurden=20eingef=C3=BCgt,=20dass=20si?=
=?UTF-8?q?ch=20entsprechende=20Teile=20im=20Kampagnenmanagement=20korrekt?=
=?UTF-8?q?=20aktualisieren.=20Die=20fehlende=20var=20wurde=20wieder=20ein?=
=?UTF-8?q?gef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../recordcontainers/jdito/onInsert.js | 1 +
.../CampaignParticipantChart_entity.aod | 5 +++++
.../CampaignParticipant_entity.aod | 1 +
.../CampaignStep_entity/CampaignStep_entity.aod | 1 +
.../CampaignMain_view/CampaignMain_view.aod | 5 -----
process/Campaign_lib/process.js | 17 ++++-------------
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
index 34147650e0..323f5b11c4 100644
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
@@ -3,6 +3,7 @@ import("system.db");
import("system.util");
import("Campaign_lib");
+var campaignId = vars.getString("$field.CAMPAIGN_ID");
var newCampaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID");
var participants = JSON.parse(vars.getString("$param.campaignParticipants_param"));
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index ec1f5061f9..bdf9f42fea 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -2,6 +2,11 @@
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
<name>CampaignParticipantChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <siblings>
+ <element>CampaignParticipant_entity</element>
+ <element>CampaignStep_entity</element>
+ <element>CampaignAddParticipants_entity</element>
+ </siblings>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index cd8c6dfe3c..d84f09f692 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -5,6 +5,7 @@
<title>Participant</title>
<siblings>
<element>CampaignAddParticipants_entity</element>
+ <element>CampaignParticipantChart_entity</element>
</siblings>
<afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState>
<titlePlural>Participants</titlePlural>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 6abbcfe3a7..9c9867bd3f 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -6,6 +6,7 @@
<title>Campaign Step</title>
<siblings>
<element>CampaignPlanning_entity</element>
+ <element>CampaignParticipantChart_entity</element>
</siblings>
<contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess>
<onValidation>%aditoprj%/entity/CampaignStep_entity/onValidation.js</onValidation>
diff --git a/neonView/CampaignMain_view/CampaignMain_view.aod b/neonView/CampaignMain_view/CampaignMain_view.aod
index c3eeb205dc..e7d4c8acfc 100644
--- a/neonView/CampaignMain_view/CampaignMain_view.aod
+++ b/neonView/CampaignMain_view/CampaignMain_view.aod
@@ -56,10 +56,5 @@
<entityField>Attributes</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
- <neonViewReference>
- <name>db6fe68c-e5e8-4916-8a78-2d01665877a7</name>
- <entityField>CampaignSteps</entityField>
- <view>CampaignStepsGantt_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 922c416365..bf72837d51 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -30,20 +30,11 @@ CampaignUtils.addParticipant = function(pContactId)
*
* @param {String} pRowIds req ContactIds
*/
-CampaignUtils.addParticipantsByRowIds = function(pRowIds, pConditionSourceTableName)
+CampaignUtils.addParticipants = function(pRowIds)
{
- _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pRowIds, "campaignParticipantsRowIds_param", "CampaignAddParticipantsEdit_view", pConditionSourceTableName);
+ _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pRowIds, "campaignParticipants_param", "CampaignAddParticipantsEdit_view");
}
-/**
- * Add many Contacts (Person or Organistaion) to a Campaign
- *
- * @param {String} pRowIds req ContactIds
- */
-CampaignUtils.addParticipantsByCondition = function(pCondition, pConditionSourceTableName)
-{
- _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pCondition, "campaignParticipantsCondition_param", "CampaignAddParticipantsEdit_view", pConditionSourceTableName);
-}
/**
* todo
@@ -320,7 +311,7 @@ function _CampaignUtils() {}
* @param {String} pView req targeting view
*
*/
-_CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityParam, pView, pConditionSourceTableName)
+_CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityParam, pView)
{
var params = {};
@@ -329,11 +320,11 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityP
params[pEntityParam] = pRowIds;
}
params["isUpdate_param"] = false;
- params["conditionSourceTableName_param"] = pConditionSourceTableName;
neon.openContext(pContext, null, null, neon.OPERATINGSTATE_NEW, params);
}
+
/**
* todo
*/
--
GitLab