diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 8 | ||||
| -rw-r--r-- | app/models/info_request.rb | 14 | ||||
| -rw-r--r-- | app/models/outgoing_mailer.rb | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 1990af2c5..003499344 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -919,9 +919,13 @@ class IncomingMessage < ActiveRecord::Base def get_main_body_text_part leaves = get_attachment_leaves - # Find first part which is text/plain + # Find first part which is text/plain or text/html + # (We have to include HTML, as increasingly there are mail clients that + # include no text alternative for the main part, and we don't want to + # instead use the first text attachment + # e.g. http://www.whatdotheyknow.com/request/list_of_public_authorties) leaves.each do |p| - if p.content_type == 'text/plain' + if p.content_type == 'text/plain' or p.content_type == 'text/html' return p end end diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 8cfc61c4e..6faf0dbad 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -202,6 +202,8 @@ public # Subject lines for emails about the request def email_subject_request + # XXX pull out this general_register_office specialisation + # into some sort of separate jurisdiction dependent file if self.public_body.url_name == 'general_register_office' # without GQ in the subject, you just get an auto response self.law_used_full + ' request GQ - ' + self.title @@ -209,11 +211,15 @@ public self.law_used_full + ' request - ' + self.title end end - def email_subject_followup - if self.public_body.url_name == 'general_register_office' - 'Re: ' + self.law_used_full + ' request GQ - ' + self.title + def email_subject_followup(incoming_message = nil) + if incoming_message.nil? + 'Re: ' + self.email_subject_request else - 'Re: ' + self.law_used_full + ' request - ' + self.title + if incoming_message.mail.subject.match(/^Re:/i) + incoming_message.mail.subject + else + 'Re: ' + incoming_message.mail.subject + end end end diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb index ae7e86f4e..1546d3fd0 100644 --- a/app/models/outgoing_mailer.rb +++ b/app/models/outgoing_mailer.rb @@ -73,7 +73,7 @@ class OutgoingMailer < ApplicationMailer if outgoing_message.what_doing == 'internal_review' return "Internal review of " + info_request.email_subject_request else - return info_request.email_subject_followup + return info_request.email_subject_followup(outgoing_message.incoming_message_followup) end end # Whether we have a valid email address for a followup |