Don't notify users about relations that are not visible (#1005).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12015 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-07-13 10:32:48 +00:00
parent 7509dda1ff
commit 0087d237f7
3 changed files with 33 additions and 3 deletions
+13
View File
@@ -68,6 +68,19 @@ class Journal < ActiveRecord::Base
end
end
def each_notification(users, &block)
if users.any?
users_by_details_visibility = users.group_by do |user|
visible_details(user)
end
users_by_details_visibility.each do |visible_details, users|
if notes? || visible_details.any?
yield(users)
end
end
end
end
# Returns the new status if the journal contains a status change, otherwise nil
def new_status
c = details.detect {|detail| detail.prop_key == 'status_id'}
+4 -3
View File
@@ -81,9 +81,10 @@ class Mailer < ActionMailer::Base
issue = journal.journalized.reload
to = journal.notified_users
cc = journal.notified_watchers
issue.each_notification(to + cc) do |users|
next unless journal.notes? || journal.visible_details(users.first).any?
Mailer.issue_edit(journal, to & users, cc & users).deliver
journal.each_notification(to + cc) do |users|
issue.each_notification(users) do |users2|
Mailer.issue_edit(journal, to & users2, cc & users2).deliver
end
end
end