diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/info_request.rb | 5 | ||||
| -rw-r--r-- | app/models/info_request_event.rb | 5 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index e9f76f445..b1d411113 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.144 2008-10-02 23:11:40 francis Exp $ +# $Id: info_request.rb,v 1.145 2008-10-03 17:09:06 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -49,6 +49,7 @@ class InfoRequest < ActiveRecord::Base validates_inclusion_of :described_state, :in => [ 'waiting_response', 'waiting_clarification', + 'gone_postal', 'not_held', 'rejected', 'successful', @@ -629,6 +630,8 @@ public "Successful." elsif status == 'waiting_clarification' "Waiting clarification." + elsif status == 'gone_postal' + "Handled by post." elsif status == 'requires_admin' "Unusual response." else diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 0b6e126a9..37a968770 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.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: info_request_event.rb,v 1.62 2008-10-02 23:11:40 francis Exp $ +# $Id: info_request_event.rb,v 1.63 2008-10-03 17:09:06 francis Exp $ class InfoRequestEvent < ActiveRecord::Base belongs_to :info_request @@ -55,6 +55,7 @@ class InfoRequestEvent < ActiveRecord::Base nil, 'waiting_response', 'waiting_clarification', + 'gone_postal', 'not_held', 'rejected', 'successful', @@ -200,6 +201,8 @@ class InfoRequestEvent < ActiveRecord::Base "Acknowledgement" elsif status == 'waiting_clarification' "Clarification required" + elsif status == 'gone_postal' + "Handled by post" elsif status == 'not_held' "Information not held" elsif status == 'rejected' diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 4f3e34806..dfe8d9830 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.59 2008-09-25 12:23:01 francis Exp $ +# $Id: request_mailer.rb,v 1.60 2008-10-03 17:09:06 francis Exp $ class RequestMailer < ApplicationMailer @@ -116,13 +116,7 @@ class RequestMailer < ApplicationMailer # Tell the requester that the public body is late in replying def overdue_alert(info_request, user) - last_response = info_request.get_last_response - if last_response.nil? - respond_url = show_response_no_followup_url(:id => info_request.id) - else - respond_url = show_response_url(:id => info_request.id, :incoming_message_id => last_response.id) - end - respond_url = respond_url + "#followup" + respond_url = respond_to_last_url(info_request) + "#followup" post_redirect = PostRedirect.new( :uri => respond_url, |