kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: locked users should not receive email notifications.

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1075 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-01-17 19:58:03 +00:00
parent 32b9bf0ef2
commit 3e031b4243
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/issue.rb
View File

@ -190,9 +190,9 @@ class Issue < ActiveRecord::Base
# Returns the mail adresses of users that should be notified for the issue # Returns the mail adresses of users that should be notified for the issue
def recipients def recipients
recipients = project.recipients recipients = project.recipients
# Author and assignee are always notified # Author and assignee are always notified unless they have been locked
recipients << author.mail if author recipients << author.mail if author && author.active?
recipients << assigned_to.mail if assigned_to recipients << assigned_to.mail if assigned_to && assigned_to.active?
recipients.compact.uniq recipients.compact.uniq
end end

2
app/models/message_observer.rb
View File

@ -18,7 +18,7 @@
class MessageObserver < ActiveRecord::Observer class MessageObserver < ActiveRecord::Observer
def after_create(message) def after_create(message)
# send notification to the authors of the thread # send notification to the authors of the thread
recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author} recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author && m.author.active?}
# send notification to the board watchers # send notification to the board watchers
recipients += message.board.watcher_recipients recipients += message.board.watcher_recipients
recipients = recipients.compact.uniq recipients = recipients.compact.uniq

2
vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb vendored
View File

@ -37,7 +37,7 @@ module Redmine
end end
def watcher_recipients def watcher_recipients
self.watchers.collect { |w| w.user.mail } self.watchers.collect { |w| w.user.mail if w.user.active? }.compact
end end
module ClassMethods module ClassMethods