From f843f7ea488b0be901b65e9bc200ee8d84f672f4 Mon Sep 17 00:00:00 2001 From: Alexander Meindl Date: Tue, 1 Sep 2020 17:31:03 +0200 Subject: [PATCH] Do not notify locked watchers, see https://www.redmine.org/issues/33935 --- lib/redmine_messenger/patches/issue_patch.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb index fcd13b9..ea56a41 100644 --- a/lib/redmine_messenger/patches/issue_patch.rb +++ b/lib/redmine_messenger/patches/issue_patch.rb @@ -17,7 +17,7 @@ module RedmineMessenger if Messenger.setting_for_project(project, :messenger_direct_users_messages) messenger_to_be_notified.each do |user| - channels.append "@#{user.login}" if user.login != author.login + channels.append "@#{user.login}" unless user == author end end @@ -71,7 +71,7 @@ module RedmineMessenger if Messenger.setting_for_project(project, :messenger_direct_users_messages) messenger_to_be_notified.each do |user| - channels.append "@#{user.login}" if user.login != current_journal.user.login + channels.append "@#{user.login}" unless user == current_journal.user end end @@ -102,7 +102,7 @@ module RedmineMessenger private def messenger_to_be_notified - to_be_notified = (notified_users + watcher_users).compact + to_be_notified = (notified_users + notified_watchers).compact to_be_notified.uniq end