From 0fed417439e0061a6c59372947b67a073fdf6cd3 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Thu, 28 Nov 2019 04:31:55 +0530 Subject: [PATCH] DEV: always trigger 'notification_created' event. And make prettier happy. --- ...ship-request-consolidated-notification-item.js.es6 | 11 ++++------- app/models/notification.rb | 8 ++------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 index ea5f54d1984..fafa3656f6b 100644 --- a/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/membership-request-consolidated-notification-item.js.es6 @@ -13,13 +13,10 @@ createWidgetFrom( }, text(notificationName, data) { - return I18n.t( - "notifications.membership_request_consolidated", - { - group_name: data.group_name, - count: parseInt(data.count, 10) - } - ); + return I18n.t("notifications.membership_request_consolidated", { + group_name: data.group_name, + count: parseInt(data.count, 10) + }); } } ); diff --git a/app/models/notification.rb b/app/models/notification.rb index a5c1e05389b..4c0419f9e78 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -26,12 +26,8 @@ class Notification < ActiveRecord::Base after_commit :refresh_notification_count, on: [:create, :update, :destroy] after_commit(on: :create) do - consolidated = consolidate_membership_requests - - unless consolidated - DiscourseEvent.trigger(:notification_created, self) - send_email - end + DiscourseEvent.trigger(:notification_created, self) + send_email unless consolidate_membership_requests end def self.ensure_consistency!