diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/info_request.rb | 7 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 4 | ||||
| -rw-r--r-- | app/views/request_mailer/followup.rhtml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 847a30cc0..6f7c5d6d3 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -17,7 +17,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.27 2008-01-14 12:22:36 francis Exp $ +# $Id: info_request.rb,v 1.28 2008-01-21 10:20:34 francis Exp $ require 'digest/sha1' @@ -85,6 +85,11 @@ public end # Work out what the situation of the request is + # awaiting - awaiting a response + # overdue - response is overdue + # information - has response containing information + # none - received a response, but no information XXX + # unknown - received a response that hasn't been classified def calculate_status # Extract aggregate information for any incoming messages all together contains_information = false diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index fdd950ba5..9eacab767 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: outgoing_message.rb,v 1.21 2008-01-10 19:59:33 francis Exp $ +# $Id: outgoing_message.rb,v 1.22 2008-01-21 10:20:34 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request @@ -111,7 +111,7 @@ class OutgoingMessage < ActiveRecord::Base end # Returns the text to quote the original message when sending this one - def get_quoted_part_of_followup + def quoted_part_to_append_to_email if self.message_type == 'followup' && !self.incoming_message_followup.nil? return "\n\n-----Original Message-----\n\n" + self.incoming_message_followup.get_body_for_quoting + "\n" else diff --git a/app/views/request_mailer/followup.rhtml b/app/views/request_mailer/followup.rhtml index 3c37b2763..f98a0ea3f 100644 --- a/app/views/request_mailer/followup.rhtml +++ b/app/views/request_mailer/followup.rhtml @@ -8,4 +8,4 @@ location: <%= main_url(request_url(@info_request)) %> Sent using GovernmentSpy, a project of UKCOD, registered charity number 1076346. ------------------------------------------------------------------- -<%= @outgoing_message.get_quoted_part_of_followup.strip %> +<%= @outgoing_message.quoted_part_to_append_to_email.strip %> |