diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 6 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 19 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 12 | ||||
| -rw-r--r-- | todo.txt | 7 |
4 files changed, 29 insertions, 15 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 030a30eb3..445a5c604 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.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_controller.rb,v 1.136 2008-11-07 01:13:37 francis Exp $ +# $Id: request_controller.rb,v 1.137 2008-11-07 02:50:59 francis Exp $ class RequestController < ApplicationController @@ -122,6 +122,7 @@ class RequestController < ApplicationController params[:info_request] = { :public_body_id => params[:public_body_id] } end @info_request = InfoRequest.new(params[:info_request]) + params[:info_request_id] = @info_request.id @outgoing_message = OutgoingMessage.new(params[:outgoing_message]) @outgoing_message.set_signature_name(@user.name) if !@user.nil? @@ -348,7 +349,8 @@ class RequestController < ApplicationController params_outgoing_message.merge!({ :status => 'ready', :message_type => 'followup', - :incoming_message_followup => @incoming_message + :incoming_message_followup => @incoming_message, + :info_request_id => @info_request.id }) @internal_review = false @internal_review_pass_on = false diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index d83f9314a..0d14ba58e 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.73 2008-11-07 01:03:14 francis Exp $ +# $Id: outgoing_message.rb,v 1.74 2008-11-07 02:50:59 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request @@ -53,8 +53,23 @@ class OutgoingMessage < ActiveRecord::Base return "Yours faithfully," end end + def get_default_letter + if self.what_doing == 'internal_review' + "Please pass this on to the person who conducts Freedom of Information reviews." + + "\n\n" + + "I am writing to request an internal review of " + + self.info_request.public_body.name + + "'s handling of my FOI request " + + "'" + self.info_request.title + "'." + + "\n\n" + + "A full history of my FOI request and all correspondence is available on the Internet at this address:\n" + + "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000') + "/request/" + self.info_request.url_title + else + "" + end + end def get_default_message - get_salutation + "\n\n\n\n" + get_signoff + "\n\n" + get_salutation + "\n\n" + get_default_letter + "\n\n" + get_signoff + "\n\n" end def set_signature_name(name) # XXX We use raw_body here to get unstripped one diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 5008522c4..0ef38ea76 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -14,12 +14,6 @@ </h2> <% end %> - <% if @internal_review %> - <p>Write a message asking the authority to conduct an internal review - of their handling of your request. - </p> - <% end %> - <% if @info_request.stop_new_responses %> <p>Follow ups and new responses to this request have been stopped to prevent spam. Please <a href="/help/contact">contact us</a> if you are <%= user_link(@info_request.user) %> @@ -79,6 +73,12 @@ </div> <% end %> + <% if @internal_review %> + <p>Edit and add <strong>more details</strong> to the message above, + explaining why you would like a review. + </p> + <% end %> + <p> <%= hidden_field_tag 'submitted_followup', 1 %> <%= hidden_field_tag(:preview, 1 ) %> @@ -3,8 +3,8 @@ Test data for Tony Internal review =============== -Add the "passing on" text from Julian's requests as default for internal review -And the URL +Change internal review request subject to something else + search for email_subject_followup Improve message on entering not_held - offer option of internal review. @@ -13,9 +13,6 @@ link through to ICO submitting help page instead. Improve look and text when you enter unhappy from choosing partial or rejection -Change internal review request subject to something else - search for email_subject_followup - Clock for internal review "The internal review should take 2-3 weeks for simple cases, and up to 6 weeks even for complex reviews." |