diff options
| -rw-r--r-- | app/mailers/request_mailer.rb | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb index d6ca40000..001d4a75c 100644 --- a/app/mailers/request_mailer.rb +++ b/app/mailers/request_mailer.rb @@ -101,9 +101,7 @@ class RequestMailer < ApplicationMailer @info_request = info_request auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => user.name_and_email, - :subject => _("Delayed response to your FOI request - ") + info_request.title.html_safe) + mail_user_with_info_request_title(user, info_request, _("Delayed response to your FOI request - ")) end # Tell the requester that the public body is very late in replying @@ -118,9 +116,7 @@ class RequestMailer < ApplicationMailer @info_request = info_request auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => user.name_and_email, - :subject => _("You're long overdue a response to your FOI request - ") + info_request.title.html_safe) + mail_user_with_info_request_title(user, info_request, _("You're long overdue a response to your FOI request - ")) end # Tell the requester that they need to say if the new response @@ -137,9 +133,7 @@ class RequestMailer < ApplicationMailer @info_request = info_request auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => info_request.user.name_and_email, - :subject => _("Was the response you got to your FOI request any good?")) + mail_user(info_request.user, _("Was the response you got to your FOI request any good?")) end # Tell the requester that someone updated their old unclassified request @@ -148,9 +142,7 @@ class RequestMailer < ApplicationMailer @info_request = info_request auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => info_request.user.name_and_email, - :subject => _("Someone has updated the status of your request")) + mail_user(info_request.user, _("Someone has updated the status of your request")) end # Tell the requester that they need to clarify their request @@ -167,9 +159,7 @@ class RequestMailer < ApplicationMailer @info_request = info_request auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => info_request.user.name_and_email, - :subject => _("Clarify your FOI request - ") + info_request.title.html_safe) + mail_user_with_info_request_title(info_request.user, info_request, _("Clarify your FOI request - ")) end # Tell requester that somebody add an annotation to their request @@ -178,18 +168,14 @@ class RequestMailer < ApplicationMailer @url = comment_url(comment) auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => info_request.user.name_and_email, - :subject => _("Somebody added a note to your FOI request - ") + info_request.title.html_safe) + mail_user_with_info_request_title(info_request.user, info_request, _("Somebody added a note to your FOI request - ")) end def comment_on_alert_plural(info_request, count, earliest_unalerted_comment) @count, @info_request = count, info_request @url = comment_url(earliest_unalerted_comment) auto_generated_headers - mail(:from => contact_from_name_and_email, - :to => info_request.user.name_and_email, - :subject => _("Some notes have been added to your FOI request - ") + info_request.title.html_safe) + mail_user_with_info_request_title(info_request.user, info_request, _("Some notes have been added to your FOI request - ")) end # Class function, called by script/mailin with all incoming responses. @@ -458,4 +444,16 @@ class RequestMailer < ApplicationMailer }) end + def mail_user_with_info_request_title(user, info_request, subject) + mail_user(user, subject + info_request.title.html_safe) + end + + def mail_user(user, subject) + mail({ + :from => contact_from_name_and_email, + :to => user.name_and_email, + :subject => subject, + }) + end + end |