diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod index 08af2bf5706a87ab3197f78d2934e59620172a60..ef824839da69ef485f55dd96252e6dd559d2f448 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 f5b266e73f872e682e54a918083f14883f9dc415..0000000000000000000000000000000000000000 --- 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 c8c1cae7589b59153447742efe69bada4f51a862..ba03529bd3ea2f1eb5a4ee098d6f97f5bd49c91f 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 07e52aa6c0d1850bd5ae108e6db373166807a3de..6d7315c3a2254ff54e27a3be2fe53f78409b02ff 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 28c9d627a08bf0f6bcd82b8c499ab64c6cdfac18..a4b0d8312c559b8f834f04c773cf27e76003ec7a 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 e31afb5e6b090c7196698da50c995e4f04521387..0000000000000000000000000000000000000000 --- 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 74b6490d99159a33336262f397a11d543ee0d6a6..a47b0870f914103180a0de1de9a8711c2b63b004 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 f5b266e73f872e682e54a918083f14883f9dc415..0000000000000000000000000000000000000000 --- 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 b045969480f302a41aedce5a29ca209fc070958e..647a9346eaf398e415a8c0cd941af77663c4b9b6 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 1ca7472528be1c2d93acf675d8bc581a38ccb70e..edb6682c34d50bd2d6e6bd64005b73bba56dabf9 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>