From 149b2b29697bfd8ba07e0e627bffb0049d3d63a0 Mon Sep 17 00:00:00 2001
From: "f.maier" <f.maier@adito.de>
Date: Fri, 22 Oct 2021 09:59:04 +0200
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.:
1084481][Unreinheiten addAttributeToSelection]
---
entity/Activity_entity/Activity_entity.aod | 3 +--
.../addattributetoselection/titleProcess.js | 8 -------
.../AddAttributesToSelection_entity.aod | 2 ++
.../affecteddata/displayValueProcess.js | 2 +-
.../Organisation_entity.aod | 3 +--
.../addattributetoselection/titleProcess.js | 8 -------
entity/Person_entity/Person_entity.aod | 3 +--
.../addattributetoselection/titleProcess.js | 8 -------
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 ++++
.../AddAttributesToSelectionEdit_view.aod | 22 +++++++++----------
10 files changed, 20 insertions(+), 43 deletions(-)
delete mode 100644 entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js
delete mode 100644 entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
delete mode 100644 entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 08af2bf570..ef824839da 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -630,11 +630,10 @@
</entityActionField>
<entityActionField>
<name>addAttributeToSelection</name>
- <title>Set attribute (use filter result)</title>
+ <title>Set attribute</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:TAGS</iconId>
- <titleProcess>%aditoprj%/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js b/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js
deleted file mode 100644
index f5b266e73f..0000000000
--- a/entity/Activity_entity/entityfields/filteractions/children/addattributetoselection/titleProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.selection").length > 0)
-{
- result.string(translate.text("set attribute (selected data)"))
-}
\ No newline at end of file
diff --git a/entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod b/entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod
index c8c1cae758..ba03529bd3 100644
--- a/entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod
+++ b/entity/AddAttributesToSelection_entity/AddAttributesToSelection_entity.aod
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
<name>AddAttributesToSelection_entity</name>
+ <title>Set attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AddAttributesToSelection_entity/documentation.adoc</documentation>
<recordContainer>jDito</recordContainer>
@@ -17,6 +18,7 @@
</entityField>
<entityField>
<name>affectedData</name>
+ <title>Affected rows</title>
<state>DISABLED</state>
<displayValueProcess>%aditoprj%/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js</displayValueProcess>
</entityField>
diff --git a/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js b/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js
index 07e52aa6c0..6d7315c3a2 100644
--- a/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js
+++ b/entity/AddAttributesToSelection_entity/entityfields/affecteddata/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.translate");
import("system.result");
-result.string(translate.text("affected rows:") + " " + parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file
+result.string(parseInt(vars.get("$param.Datalength_param"), "#0"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 28c9d627a0..a4b0d8312c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1381,11 +1381,10 @@
</entityActionField>
<entityActionField>
<name>addAttributeToSelection</name>
- <title>Set attribute (use filter result)</title>
+ <title>Set attribute</title>
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:TAGS</iconId>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
deleted file mode 100644
index e31afb5e6b..0000000000
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.selection").length > 0)
-{
- result.string(translate.text("set attribute (selected data)"));
-}
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 74b6490d99..a47b0870f9 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1317,11 +1317,10 @@
</entityActionField>
<entityActionField>
<name>addAttributeToSelection</name>
- <title>Set attribute (use filter result)</title>
+ <title>Set attribute</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:TAGS</iconId>
- <titleProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js</titleProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
deleted file mode 100644
index f5b266e73f..0000000000
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addattributetoselection/titleProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-
-if (vars.get("$sys.selection").length > 0)
-{
- result.string(translate.text("set attribute (selected data)"))
-}
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index b045969480..647a9346ea 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -1306,6 +1306,10 @@
<key>Copy Campaign</key>
<value>Kopiere Kampagne</value>
</entry>
+ <entry>
+ <key>Affected rows</key>
+ <value>Betroffene Datensätze</value>
+ </entry>
<entry>
<key>Turnover</key>
<value>Umsatz</value>
diff --git a/neonView/AddAttributesToSelectionEdit_view/AddAttributesToSelectionEdit_view.aod b/neonView/AddAttributesToSelectionEdit_view/AddAttributesToSelectionEdit_view.aod
index 1ca7472528..edb6682c34 100644
--- a/neonView/AddAttributesToSelectionEdit_view/AddAttributesToSelectionEdit_view.aod
+++ b/neonView/AddAttributesToSelectionEdit_view/AddAttributesToSelectionEdit_view.aod
@@ -6,25 +6,23 @@
<layout>
<headerFooterLayout>
<name>layout</name>
- <footer>Generic</footer>
+ <header>scoreCardViewTemplate</header>
</headerFooterLayout>
</layout>
<children>
- <neonViewReference>
- <name>3f715b52-ef4b-4b62-916c-0a23833bc2da</name>
- <entityField>AddAttributeToSelectionMultiEdit</entityField>
- <view>AddAttributesToSelectionMultiEdit_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Generic</name>
- <hideLabels v="true" />
- <isEditable v="false" />
+ <scoreCardViewTemplate>
+ <name>scoreCardViewTemplate</name>
<fields>
<entityFieldLink>
- <name>93ffcf34-83ee-4200-a711-1be6aef880b6</name>
+ <name>24e89b7b-7f57-47fd-a437-9e882b71b8a7</name>
<entityField>affectedData</entityField>
</entityFieldLink>
</fields>
- </genericViewTemplate>
+ </scoreCardViewTemplate>
+ <neonViewReference>
+ <name>3f715b52-ef4b-4b62-916c-0a23833bc2da</name>
+ <entityField>AddAttributeToSelectionMultiEdit</entityField>
+ <view>AddAttributesToSelectionMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab