From 96edfbc13814fbd6a6387ca0ad9ad40aa79f3e4a Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 4 Jul 2019 10:20:39 +0200
Subject: [PATCH] =?UTF-8?q?Die=20Aktion=20zum=20Hinzuf=C3=BCgen=20zu=20ein?=
=?UTF-8?q?er=20Kampagne=20am=20Kontakt=20nutzt=20nun=20den=20gleichen=20V?=
=?UTF-8?q?iew=20wie=20die=20Serienaktion.=20Somit=20findet=20auch=20hier?=
=?UTF-8?q?=20nun=20die=20korrekte=20Pr=C3=BCfung=20statt.=20Aktionen=20zu?=
=?UTF-8?q?m=20Bearbeiten=20und=20Einzel-Hinzuf=C3=BCgen=20in=20der=20Filt?=
=?UTF-8?q?erView=20der=20CampaignParticipants=20wurde=20deaktiviert,=20da?=
=?UTF-8?q?=20hier=20eine=20andere=20view=20genutzt=20wurde,=20welche=20ke?=
=?UTF-8?q?ine=20Pr=C3=BCfung=20hatte.=20Zus=C3=A4tzlich=20ergibt=20es=20v?=
=?UTF-8?q?om=20Ablauf=20her=20keinen=20Sinn=20an=20dieser=20Stelle=20einz?=
=?UTF-8?q?elne=20Teilnehmer=20hinzuzuf=C3=BCgen,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/isoperationvalid/valueProcess.js | 2 +-
.../entityfields/addtocampaign/onActionProcess.js | 3 ++-
.../entityfields/addtocampaign/onActionProcess.js | 3 ++-
.../CampaignParticipantFilter_view.aod | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
index 3682d70ed9..85fd13c825 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/isoperationvalid/valueProcess.js
@@ -91,7 +91,7 @@ if(selectedCampaignId != '')
if(countValidParticipantsToAdd <= 0)
{
- messageString = "Alle selektierten Teilnehmer befinden sich bereits in der Stufe";
+ messageString = "Alle selektierten Teilnehmer befinden sich bereits in der Kampagne";
}
else if(hasStepEnoughSlots(countValidParticipantsToAdd))
{
diff --git a/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js b/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js
index 44dc17d653..2b8021ddae 100644
--- a/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/addtocampaign/onActionProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("Campaign_lib");
-CampaignUtils.addParticipant(vars.getString("$field.CONTACTID"));
\ No newline at end of file
+var contactIdRay = [vars.getString("$field.CONTACTID")];
+CampaignUtils.addParticipantsByRowIds(JSON.stringify(contactIdRay), "ORGANISATION");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js b/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js
index 44dc17d653..f04c2eb6b2 100644
--- a/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js
+++ b/entity/Person_entity/entityfields/addtocampaign/onActionProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("Campaign_lib");
-CampaignUtils.addParticipant(vars.getString("$field.CONTACTID"));
\ No newline at end of file
+var contactIdRay = [vars.getString("$field.CONTACTID")];
+CampaignUtils.addParticipantsByRowIds(JSON.stringify(contactIdRay), "PERSON");
\ No newline at end of file
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 907ed6c261..4730eea478 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -15,6 +15,7 @@
<name>ParticipantsTable</name>
<favoriteActionGroup1>FilterViewActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
+ <isCreatable v="false" />
<isEditable v="false" />
<columns>
<neonTableColumn>
--
GitLab