From 6415ebec6915ec76fb2f77e76e3b82b93df72352 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 10 Jun 2020 14:39:25 +0200
Subject: [PATCH] Revert "#1057422 Notifications: rowClickAction deleted,
refreshAll deleted"
This reverts commit d2a2075f825bbccc5ed37f98bbaf42f7ffe77779.
---
entity/Notification_entity/Notification_entity.aod | 4 ++++
.../entityfields/rowclickaction/onActionProcess.js | 12 ++++++++++++
.../children/setread/onActionProcess.js | 2 +-
.../NotificationFilter_view.aod | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index e60a97235f..e337c20729 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -120,6 +120,10 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityActionField>
+ <name>rowClickAction</name>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+ </entityActionField>
<entityField>
<name>RESOLVEDPRIORITY</name>
<title>priority</title>
diff --git a/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
new file mode 100644
index 0000000000..5ee955fd63
--- /dev/null
+++ b/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.tools");
+import("system.notification");
+import("system.neon");
+
+var user = tools.getCurrentUser();
+var selectedNotifications = vars.get("$sys.selection");
+
+for(var i = 0; i < selectedNotifications.length; i++)
+ notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
+
+neon.refresh();
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index 608c454e87..5ee955fd63 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -9,4 +9,4 @@ var selectedNotifications = vars.get("$sys.selection");
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
-//neon.refreshAll();
\ No newline at end of file
+neon.refresh();
\ No newline at end of file
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index a2eda9d9af..bb14afb0a2 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -38,7 +38,7 @@
<name>NotificationTable</name>
<favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<inlineEdit v="true" />
- <entryAction></entryAction>
+ <entryAction>rowClickAction</entryAction>
<iconField>ICON</iconField>
<titleField>CAPTION</titleField>
<subtitleField>RESOLVEDPRIORITY</subtitleField>
--
GitLab