From 9dc6576c4cc15c63968868e21e416c9a6db0df7d Mon Sep 17 00:00:00 2001 From: Daniel Tran <d.tran@adito.de> Date: Mon, 22 Feb 2021 10:24:45 +0000 Subject: [PATCH] - converted param to boolean to get right behavior. - added necessary translation. --- .../campaignparticipantmessage/valueProcess.js | 3 ++- entity/Campaign_entity/entityfields/status/valueProcess.js | 7 +++++-- language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js index a962faa846..50b80a7140 100644 --- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js +++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js @@ -4,6 +4,7 @@ import("system.result"); import("system.vars"); import("Campaign_lib"); import("FilterViewAction_lib"); +import("Util_lib"); var res = ""; var resNotAdded = "\n"; @@ -11,7 +12,7 @@ var resNotAdded = "\n"; if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.campaignparticipantContactIds") && !vars.get("$sys.validationerrors")) { var selectedIds; - var isUpdate = vars.get("$param.isUpdate_param"); + var isUpdate = Utils.toBoolean(vars.get("$param.isUpdate_param")); var validCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length; var comingfrom = vars.get("$param.dataSourceTableName_param"); diff --git a/entity/Campaign_entity/entityfields/status/valueProcess.js b/entity/Campaign_entity/entityfields/status/valueProcess.js index c3b6c3a036..709bac7b56 100644 --- a/entity/Campaign_entity/entityfields/status/valueProcess.js +++ b/entity/Campaign_entity/entityfields/status/valueProcess.js @@ -1,7 +1,10 @@ -import("KeywordRegistry_basic"); import("system.neon"); import("system.vars"); import("system.result"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null) - result.string($KeywordRegistry.campaignState$planning); \ No newline at end of file +{ + result.string(KeywordUtils.getViewValue($KeywordRegistry.campaignState(), $KeywordRegistry.campaignState$planning())); +} \ No newline at end of file diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 1afd8f40e3..4947267db0 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -9307,7 +9307,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>%0 new participants will be added to the campaign.</key> - <value>Der Kampagne werden %0 neue Empfänger hinzugefügt.</value> + <value>Der Kampagne werden %0 neue Teilnehmer hinzugefügt.</value> </entry> <entry> <key>%0 of the chosen records are already recipients or don't have an e-mail set</key> @@ -10644,6 +10644,10 @@ Bitte Datumseingabe prüfen</value> <entry> <key>HTML Editor</key> </entry> + <entry> + <key>Participant is already participating</key> + <value>Teilnehmer nimmt bereits teil.</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> -- GitLab