From e31c0856d1ae3eb701487331e63c001fc87b83d0 Mon Sep 17 00:00:00 2001 From: "b.ulrich" <b.ulrich@adito.de> Date: Wed, 13 May 2020 07:52:42 +0200 Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1053788][Notifications: Buttonlabel inkonsistent zu Statusnamen] --- entity/Notification_entity/Notification_entity.aod | 10 +++++----- .../children/{setunread => setnew}/onActionProcess.js | 0 .../children/{setunread => setnew}/tooltipProcess.js | 0 language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++ language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 ++++++++ language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++++++ 6 files changed, 25 insertions(+), 5 deletions(-) rename entity/Notification_entity/entityfields/setnotificationstate/children/{setunread => setnew}/onActionProcess.js (100%) rename entity/Notification_entity/entityfields/setnotificationstate/children/{setunread => setnew}/tooltipProcess.js (100%) diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod index 71ce2c0cd1..3268918106 100644 --- a/entity/Notification_entity/Notification_entity.aod +++ b/entity/Notification_entity/Notification_entity.aod @@ -100,7 +100,7 @@ </entityActionField> <entityActionField> <name>setRead</name> - <title>setRead</title> + <title>set Read</title> <description></description> <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess> <isSelectionAction v="true" /> @@ -109,14 +109,14 @@ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess> </entityActionField> <entityActionField> - <name>setUnread</name> - <title>setUnread</title> + <name>setNew</name> + <title>set New</title> <description></description> - <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess> + <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js</onActionProcess> <isSelectionAction v="true" /> <iconId>VAADIN:BOOK</iconId> <tooltip></tooltip> - <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js</tooltipProcess> + <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess> </entityActionField> </children> </entityActionGroup> diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js similarity index 100% rename from entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js rename to entity/Notification_entity/entityfields/setnotificationstate/children/setnew/onActionProcess.js diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js similarity index 100% rename from entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js rename to entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index a2bc2ddbc2..943e1a53d4 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -6755,6 +6755,12 @@ <entry> <key>Sales Projects</key> </entry> + <entry> + <key>set Read</key> + </entry> + <entry> + <key>set New</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 16f4c12205..ef31478f17 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -8659,6 +8659,14 @@ Bitte Datumseingabe prüfen</value> <entry> <key>Sales Projects</key> </entry> + <entry> + <key>set Read</key> + <value>Gelesen setzen</value> + </entry> + <entry> + <key>set New</key> + <value>Neu setzen</value> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 02755fe365..ff938e7635 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -6820,6 +6820,12 @@ <entry> <key>Sales Projects</key> </entry> + <entry> + <key>set Read</key> + </entry> + <entry> + <key>set New</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> -- GitLab