jro_apps/redmine Commit - r3007:c870a7b9ef35

Do not notify users that are no longer allowed to view an issue (#3589, #4263)....

Jean-Philippe Lang -

r3007:c870a7b9ef35

parent child

Context file:

r3007:c870a7b9ef35

app/models/issue.rb +15 -5

                  blocked? ? statuses.reject {|s| s.is_closed?} : statuses
                end
-               # Returns the mail adresses of users that should be notified for the issue
+               # Returns the mail adresses of users that should be notified
                def recipients
-                 recipients = project.recipients
+                 notified = project.notified_users
                  # Author and assignee are always notified unless they have been locked
-                 recipients << author.mail if author && author.active?
-                 recipients << assigned_to.mail if assigned_to && assigned_to.active?
-                 recipients.compact.uniq
+                 notified << author if author && author.active?
+                 notified << assigned_to if assigned_to && assigned_to.active?
+                 notified.uniq!
+                 # Remove users that can not view the issue
+                 notified.reject! {|user| !visible?(user)}
+                 notified.collect(&:mail)
+               end
+               # Returns the mail adresses of watchers that should be notified
+               def watcher_recipients
+                 notified = watcher_users
+                 notified.reject! {|user| !user.active? || !visible?(user)}
+                 notified.collect(&:mail)
                end
                # Returns the total number of hours spent on this issue.

app/models/project.rb +5 0

                  members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
                end
+               # Returns the users that should be notified on project events
+               def notified_users
+                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user}
+               end
                # Returns an array of all custom fields enabled for project issues
                # (explictly associated custom fields and custom fields enabled for all projects)
                def all_issue_custom_fields

test/fixtures/issues.yml +1 -1

                description:
                tracker_id: 1
                assigned_to_id:
-               author_id: 2
+               author_id: 3
                status_id: 5
                start_date: <%= 1.day.ago.to_date.to_s(:db) %>
                due_date:

test/unit/issue_test.rb +17 0

                  assert_nil copy.custom_value_for(2)
                end
+               def test_recipients_should_not_include_users_that_cannot_view_the_issue
+                 issue = Issue.find(12)
+                 assert issue.recipients.include?(issue.author.mail)
+                 # move the issue to a private project
+                 copy  = issue.move_to(Project.find(5), Tracker.find(2), :copy => true)
+                 # author is not a member of project anymore
+                 assert !copy.recipients.include?(copy.author.mail)
+               end
+               def test_watcher_recipients_should_not_include_users_that_cannot_view_the_issue
+                 user = User.find(3)
+                 issue = Issue.find(9)
+                 Watcher.create!(:user => user, :watchable => issue)
+                 assert issue.watched_by?(user)
+                 assert !issue.watcher_recipients.include?(user.mail)
+               end
                def test_issue_destroy
                  Issue.find(1).destroy
                  assert_nil Issue.find_by_id(1)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages