第23回 mailer.rbの未実装だったメソッドを実装した

Author: juno-nishizaki

app/models/mailer.rb

@@ -164,7 +164,7 @@ def self.deliver_document_added(document, author)
   end
 
   # Builds a mail to user about new attachements.
-  def attachments_added(user, attachments)
+  def attachments_added(user, attachments, recipients=nil)
     container = attachments.first.container
     added_to = ''
     added_to_url = ''
@@ -183,6 +183,7 @@ def attachments_added(user, attachments)
     redmine_headers 'Project' => container.project.identifier
     @attachments = attachments
     @user = user
+    @recipients = recipients
     @added_to = added_to
     @added_to_url = added_to_url
     mail :to => user,
@@ -203,18 +204,19 @@ def self.deliver_attachments_added(attachments)
     end
 
     users.each do |user|
-      attachments_added(user, attachments).deliver_later
+      attachments_added(user, attachments, users).deliver_later
     end
   end
 
   # Builds a mail to user about a new news.
-  def news_added(user, news)
+  def news_added(user, news, recipients=nil)
     redmine_headers 'Project' => news.project.identifier
     @author = news.author
     message_id news
     references news
     @news = news
     @user = user
+    @recipients = recipients
     @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
     mail :to => user,
       :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
@@ -227,12 +229,12 @@ def news_added(user, news)
   def self.deliver_news_added(news)
     users = news.notified_users | news.notified_watchers_for_added_news
     users.each do |user|
-      news_added(user, news).deliver_later
+      news_added(user, news, users).deliver_later
     end
   end
 
   # Builds a mail to user about a new news comment.
-  def news_comment_added(user, comment)
+  def news_comment_added(user, comment, recipients=nil)
     news = comment.commented
     redmine_headers 'Project' => news.project.identifier
     @author = comment.author
@@ -241,6 +243,7 @@ def news_comment_added(user, comment)
     @news = news
     @comment = comment
     @user = user
+    @recipients = recipients
     @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
     mail :to => user,
      :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
@@ -254,19 +257,20 @@ def self.deliver_news_comment_added(comment)
     news = comment.commented
     users = news.notified_users | news.notified_watchers
     users.each do |user|
-      news_comment_added(user, comment).deliver_later
+      news_comment_added(user, comment, users).deliver_later
     end
   end
 
   # Builds a mail to user about a new message.
-  def message_posted(user, message)
+  def message_posted(user, message, recipients=nil)
     redmine_headers 'Project' => message.project.identifier,
                     'Topic-Id' => (message.parent_id || message.id)
     @author = message.author
     message_id message
     references message.root
     @message = message
     @user = user
+    @recipients = recipients
     @message_url = url_for(message.event_url)
     mail :to => user,
       :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
@@ -282,18 +286,19 @@ def self.deliver_message_posted(message)
     users |= message.board.notified_watchers
 
     users.each do |user|
-      message_posted(user, message).deliver_later
+      message_posted(user, message, users).deliver_later
     end
   end
 
   # Builds a mail to user about a new wiki content.
-  def wiki_content_added(user, wiki_content)
+  def wiki_content_added(user, wiki_content, recipients=nil)
     redmine_headers 'Project' => wiki_content.project.identifier,
                     'Wiki-Page-Id' => wiki_content.page.id
     @author = wiki_content.author
     message_id wiki_content
     @wiki_content = wiki_content
     @user = user
+    @recipients = recipients
     @wiki_content_url = url_for(:controller => 'wiki', :action => 'show',
                                       :project_id => wiki_content.project,
                                       :id => wiki_content.page.title)
@@ -311,18 +316,19 @@ def wiki_content_added(user, wiki_content)
   def self.deliver_wiki_content_added(wiki_content)
     users = wiki_content.notified_users | wiki_content.page.wiki.notified_watchers | wiki_content.notified_mentions
     users.each do |user|
-      wiki_content_added(user, wiki_content).deliver_later
+      wiki_content_added(user, wiki_content, users).deliver_later
     end
   end
 
   # Builds a mail to user about an update of the specified wiki content.
-  def wiki_content_updated(user, wiki_content)
+  def wiki_content_updated(user, wiki_content, recipients=nil)
     redmine_headers 'Project' => wiki_content.project.identifier,
                     'Wiki-Page-Id' => wiki_content.page.id
     @author = wiki_content.author
     message_id wiki_content
     @wiki_content = wiki_content
     @user = user
+    @recipients = recipients
     @wiki_content_url =
       url_for(:controller => 'wiki', :action => 'show',
               :project_id => wiki_content.project,
@@ -349,7 +355,7 @@ def self.deliver_wiki_content_updated(wiki_content)
     users |= wiki_content.notified_mentions
 
     users.each do |user|
-      wiki_content_updated(user, wiki_content).deliver_later
+      wiki_content_updated(user, wiki_content, users).deliver_later
     end
   end
 
@@ -368,8 +374,9 @@ def self.deliver_account_information(user, password)
   end
 
   # Builds a mail to user about an account activation request.
-  def account_activation_request(user, new_user)
+  def account_activation_request(user, new_user, recipients=nil)
     @new_user = new_user
+    @recipients = recipients
     @url = url_for(:controller => 'users', :action => 'index',
                          :status => User::STATUS_REGISTERED,
                          :sort_key => 'created_on', :sort_order => 'desc')
@@ -386,7 +393,7 @@ def self.deliver_account_activation_request(new_user)
     # Send the email to all active administrators
     users = User.active.where(:admin => true)
     users.each do |user|
-      account_activation_request(user, new_user).deliver_later
+      account_activation_request(user, new_user, users.to_a).deliver_later
     end
   end
 
@@ -470,7 +477,8 @@ def self.deliver_register(user, token)
   #     field: :field_mail,
   #     value: address
   #   ) => Mail::Message object
-  def security_notification(user, sender, options={})
+  def security_notification(user, sender, options={}, recipients=nil)
+    @recipients = recipients
     @sender = sender
     redmine_headers 'Sender' => sender.login
     @message =
@@ -507,12 +515,13 @@ def self.deliver_security_notification(users, sender, options={})
     options[:remote_ip] ||= sender.remote_ip
 
     Array.wrap(users).each do |user|
-      security_notification(user, sender, options).deliver_later
+      security_notification(user, sender, options, users).deliver_later
     end
   end
 
   # Build a mail to user about application settings changes made by sender.
-  def settings_updated(user, sender, changes, options={})
+  def settings_updated(user, sender, changes, options={}, recipients=nil)
+    @recipients = recipients
     @sender = sender
     redmine_headers 'Sender' => sender.login
     @changes = changes
@@ -539,7 +548,7 @@ def self.deliver_settings_updated(sender, changes, options={})
 
     users = User.active.where(admin: true).to_a
     users.each do |user|
-      settings_updated(user, sender, changes, options).deliver_later
+      settings_updated(user, sender, changes, options, users).deliver_later
     end
   end