From 00b690da99681e85da260f6150d83f4077a5fc7d Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 24 Nov 2015 12:21:33 +0200 Subject: [PATCH] notification enhancement --- frontend/client/src/views/notifications/badge.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/client/src/views/notifications/badge.js b/frontend/client/src/views/notifications/badge.js index 810b0be503..98612c2190 100644 --- a/frontend/client/src/views/notifications/badge.js +++ b/frontend/client/src/views/notifications/badge.js @@ -26,11 +26,11 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('Views.Notifications.Badge', 'View', function (Dep) { +Espo.define('views/notifications/badge', 'view', function (Dep) { return Dep.extend({ - template: 'notifications.badge', + template: 'notifications/badge', notificationsCheckInterval: 10, @@ -190,7 +190,13 @@ Espo.define('Views.Notifications.Badge', 'View', function (Dep) { if (id) { id = name + '_' + id; - if (~this.shownNotificationIds.indexOf(id)) return; + if (~this.shownNotificationIds.indexOf(id)) { + var notificationView = this.getView('popup-' + id); + if (notificationView) { + notificationView.trigger('update-data', data.data); + } + return; + } if (~this.closedNotificationIds.indexOf(id)) return; } else { id = this.lastId++;