diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-23 17:55:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-23 17:55:29 +0000 |
| commit | 22317105f99ef444dc6262c041bc464adc845933 (patch) | |
| tree | ee4ba6cc41e3811c69fe759ef24b2bf89244c20a /app | |
| parent | f2e7aa596b4e9676d40019afbbdce6e0d944f442 (diff) | |
| download | redmine-22317105f99ef444dc6262c041bc464adc845933.tar.gz redmine-22317105f99ef444dc6262c041bc464adc845933.zip | |
Notify previous assignee when assignee changes (#2694).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8695 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/issue.rb | 22 | ||||
| -rw-r--r-- | app/models/user.rb | 6 |
2 files changed, 18 insertions, 10 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index ad91ab488..2b9b12b77 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -514,19 +514,27 @@ class Issue < ActiveRecord::Base blocked? ? statuses.reject {|s| s.is_closed?} : statuses end + def assigned_to_was + if assigned_to_id_changed? && assigned_to_id_was.present? + @assigned_to_was ||= User.find_by_id(assigned_to_id_was) + end + end + # Returns the mail adresses of users that should be notified def recipients - notified = project.notified_users + notified = [] # Author and assignee are always notified unless they have been # locked or don't want to be notified - notified << author if author && author.active? && author.notify_about?(self) + notified << author if author if assigned_to - if assigned_to.is_a?(Group) - notified += assigned_to.users.select {|u| u.active? && u.notify_about?(self)} - else - notified << assigned_to if assigned_to.active? && assigned_to.notify_about?(self) - end + notified += (assigned_to.is_a?(Group) ? assigned_to.users : [assigned_to]) + end + if assigned_to_was + notified += (assigned_to_was.is_a?(Group) ? assigned_to_was.users : [assigned_to_was]) end + notified = notified.select {|u| u.active? && u.notify_about?(self)} + + notified += project.notified_users notified.uniq! # Remove users that can not view the issue notified.reject! {|user| !visible?(user)} diff --git a/app/models/user.rb b/app/models/user.rb index 92e341411..9be6143dc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -509,7 +509,7 @@ class User < Principal true when 'selected' # user receives notifications for created/assigned issues on unselected projects - if object.is_a?(Issue) && (object.author == self || is_or_belongs_to?(object.assigned_to)) + if object.is_a?(Issue) && (object.author == self || is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)) true else false @@ -517,13 +517,13 @@ class User < Principal when 'none' false when 'only_my_events' - if object.is_a?(Issue) && (object.author == self || is_or_belongs_to?(object.assigned_to)) + if object.is_a?(Issue) && (object.author == self || is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)) true else false end when 'only_assigned' - if object.is_a?(Issue) && is_or_belongs_to?(object.assigned_to) + if object.is_a?(Issue) && (is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)) true else false |