diff options
| -rw-r--r-- | app/models/request_mailer.rb | 12 | ||||
| -rw-r--r-- | app/views/request/followup_preview.rhtml | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 0ef9faf62..7ed959e48 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_mailer.rb,v 1.64 2008-10-28 12:37:32 francis Exp $ +# $Id: request_mailer.rb,v 1.65 2008-11-07 02:57:56 francis Exp $ class RequestMailer < ApplicationMailer @@ -21,7 +21,7 @@ class RequestMailer < ApplicationMailer def followup(info_request, outgoing_message, incoming_message_followup) @from = info_request.incoming_name_and_email @recipients = RequestMailer.name_and_email_for_followup(info_request, incoming_message_followup) - @subject = info_request.email_subject_followup + @subject = RequestMailer.subject_for_followup(info_request, outgoing_message) @body = {:info_request => info_request, :outgoing_message => outgoing_message, :incoming_message_followup => incoming_message_followup, :contact_email => MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') } @@ -55,7 +55,13 @@ class RequestMailer < ApplicationMailer return incoming_message_followup.mail.from_addrs[0].spec end end - + def RequestMailer.subject_for_followup(info_request, outgoing_message) + if outgoing_message.what_doing == 'internal_review' + return "Internal review of " + info_request.email_subject_request + else + return info_request.email_subject_followup + end + end # Used when an FOI officer uploads a response from their web browser - this is # the "fake" email used to store in the same format in the database as if they diff --git a/app/views/request/followup_preview.rhtml b/app/views/request/followup_preview.rhtml index e26b4a36a..e8fd1af36 100644 --- a/app/views/request/followup_preview.rhtml +++ b/app/views/request/followup_preview.rhtml @@ -20,7 +20,7 @@ <div class="correspondence" id="outgoing-0"> <p class="preview_subject"> <strong>To:</strong> <%=h RequestMailer.name_for_followup(@info_request, @incoming_message) %> - <br><strong>Subject:</strong> <%=h @info_request.email_subject_followup %> + <br><strong>Subject:</strong> <%=h RequestMailer.subject_for_followup(@info_request, @outgoing_message) %> </p> <div class="correspondence_text"> |