diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-05 15:49:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-05 15:49:07 +0000 |
| commit | c8b722456c5d73e0a85c2073cd3fd7cd5c35a29c (patch) | |
| tree | 748bf3cba8c73eca77b5ceffbe1b33f117def0e1 /app | |
| parent | 7f3cc6e38b873d5f56b411872ddcd3570223b7ad (diff) | |
| download | redmine-c8b722456c5d73e0a85c2073cd3fd7cd5c35a29c.tar.gz redmine-c8b722456c5d73e0a85c2073cd3fd7cd5c35a29c.zip | |
Fixed that watchers receive notifications for private comments without permission (#12286).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10789 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/journal.rb | 8 | ||||
| -rw-r--r-- | app/models/mailer.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/models/journal.rb b/app/models/journal.rb index 895b8537d..560ccf3b8 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -100,6 +100,14 @@ class Journal < ActiveRecord::Base notified.map(&:mail) end + def watcher_recipients + notified = journalized.notified_watchers + if private_notes? + notified = notified.select {|user| user.allowed_to?(:view_private_notes, journalized.project)} + end + notified.map(&:mail) + end + private def split_private_notes diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 91b58dda2..9c19438a7 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -64,7 +64,7 @@ class Mailer < ActionMailer::Base @author = journal.user recipients = journal.recipients # Watchers in cc - cc = issue.watcher_recipients - recipients + cc = journal.watcher_recipients - recipients s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] " s << "(#{issue.status.name}) " if journal.new_value_for('status_id') s << issue.subject |