Add support for multiple email addresses per user (#4244).

git-svn-id: http://svn.redmine.org/redmine/trunk@13886 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 16 insertions, 7 deletions

diff --git a/app/models/news.rb b/app/models/news.rb
index e0793d9a8..b8bc35f39 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -54,20 +54,29 @@ class News < ActiveRecord::Base
     user.allowed_to?(:comment_news, project)
   end
 
+  def notified_users
+    project.users.select {|user| user.notify_about?(self) && user.allowed_to?(:view_news, project)}
+  end
+
   def recipients
-    project.users.select {|user| user.notify_about?(self) && user.allowed_to?(:view_news, project)}.map(&:mail)
+    notified_users.map(&:mail)
   end
 
-  # Returns the email addresses that should be cc'd when a new news is added
-  def cc_for_added_news
-    cc = []
+  # Returns the users that should be cc'd when a new news is added
+  def notified_watchers_for_added_news
+    watchers = []
     if m = project.enabled_module('news')
-      cc = m.notified_watchers
+      watchers = m.notified_watchers
       unless project.is_public?
-        cc = cc.select {|user| project.users.include?(user)}
+        watchers = watchers.select {|user| project.users.include?(user)}
       end
     end
-    cc.map(&:mail)
+    watchers
+  end
+
+  # Returns the email addresses that should be cc'd when a new news is added
+  def cc_for_added_news
+    notified_watchers_for_added_news.map(&:mail)
   end
 
   # returns latest news for projects visible by user