diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 5 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 5b2d64753..59eade8fd 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.192 2009-06-15 16:25:14 francis Exp $ +# $Id: info_request.rb,v 1.193 2009-06-16 17:28:17 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -525,6 +525,9 @@ public def recipient_email return self.public_body.request_email end + def recipient_email_valid? + return self.public_body.is_requestable? + end def recipient_name_and_email return TMail::Address.address_from_name_and_email(self.law_used_short + " requests at " + self.public_body.short_or_long_name, self.recipient_email).to_s end diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index ad1fd584e..6c5537b3f 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.78 2009-06-15 23:52:44 francis Exp $ +# $Id: request_mailer.rb,v 1.79 2009-06-16 17:28:17 francis Exp $ class RequestMailer < ApplicationMailer @@ -58,6 +58,7 @@ class RequestMailer < ApplicationMailer return incoming_message_followup.mail.from_addrs[0].spec end end + # Subject to use for followup 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 @@ -65,6 +66,16 @@ class RequestMailer < ApplicationMailer return info_request.email_subject_followup end end + # Whether we have a valid email address for a followup + def RequestMailer.is_followupable?(info_request, incoming_message_followup) + if incoming_message_followup.nil? || !incoming_message_followup.valid_to_reply_to? + return info_request.recipient_email_valid? + else + # email has been checked in incoming_message_followup.valid_to_reply_to? above + return true + 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 |