From 2ebb68a764de03afb42db30a0ad2604df59780c1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 14 May 2019 10:29:18 +0200
Subject: [PATCH] campaignCost: filter steps for current campaign
---
.../CampaignAddParticipants_entity.aod | 2 +-
entity/CampaignCost_entitiy/CampaignCost_entitiy.aod | 8 +++++++-
.../children/campaignid_param/valueProcess.js | 4 ++++
.../CampaignParticipant_entity.aod | 2 +-
entity/CampaignStep_entity/CampaignStep_entity.aod | 2 +-
entity/Campaign_entity/Campaign_entity.aod | 2 +-
6 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index a4103a08d2..40b70dd5bc 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -49,7 +49,7 @@
<dependency>
<name>dependency</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignProvider</fieldName>
+ <fieldName>Campaigns</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index bf72bda9e0..52639f9195 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -148,7 +148,7 @@
<dependency>
<name>dependency</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignProvider</fieldName>
+ <fieldName>Campaigns</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
@@ -159,6 +159,12 @@
<entityName>CampaignStep_entity</entityName>
<fieldName>CampaignSteps</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>campaignId_param</name>
+ <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>KeywordCampaignManagementCostCategory</name>
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
new file mode 100644
index 0000000000..dc855dd051
--- /dev/null
+++ b/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$param.CampaignId_param"))
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 47b855205d..1a2772e786 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -97,7 +97,7 @@
<dependency>
<name>dependency</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignProvider</fieldName>
+ <fieldName>Campaigns</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 26df0d0a1a..fd6c7039a9 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -248,7 +248,7 @@
<dependency>
<name>dependency</name>
<entityName>Campaign_entity</entityName>
- <fieldName>CampaignProvider</fieldName>
+ <fieldName>Campaigns</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 387e4cf5c2..4f2251ec14 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -127,7 +127,7 @@
</children>
</entityConsumer>
<entityProvider>
- <name>CampaignProvider</name>
+ <name>Campaigns</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
--
GitLab