diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/request/_followup.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/followup_preview.rhtml | 2 | ||||
| -rw-r--r-- | todo.txt | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index c0d788fc0..030a30eb3 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.135 2008-11-07 00:01:49 francis Exp $ +# $Id: request_controller.rb,v 1.136 2008-11-07 01:13:37 francis Exp $ class RequestController < ApplicationController @@ -351,9 +351,11 @@ class RequestController < ApplicationController :incoming_message_followup => @incoming_message }) @internal_review = false + @internal_review_pass_on = false if !params[:internal_review].nil? params_outgoing_message[:what_doing] = 'internal_review' @internal_review = true + @internal_review_pass_on = true end @outgoing_message = OutgoingMessage.new(params_outgoing_message) @outgoing_message.set_signature_name(@user.name) if !@user.nil? @@ -390,6 +392,9 @@ class RequestController < ApplicationController return end if params[:preview].to_i == 1 + if @outgoing_message.what_doing == 'internal_review' + @internal_review = true + end render :action => 'followup_preview' return end diff --git a/app/views/request/_followup.rhtml b/app/views/request/_followup.rhtml index 3839f0869..5008522c4 100644 --- a/app/views/request/_followup.rhtml +++ b/app/views/request/_followup.rhtml @@ -82,7 +82,7 @@ <p> <%= hidden_field_tag 'submitted_followup', 1 %> <%= hidden_field_tag(:preview, 1 ) %> - <% if @internal_review %> + <% if @internal_review_pass_on %> <%= hidden_field_tag(:internal_review, 1 ) %> <% end %> <%= submit_tag "Preview your message" %> diff --git a/app/views/request/followup_preview.rhtml b/app/views/request/followup_preview.rhtml index 9cb602244..e26b4a36a 100644 --- a/app/views/request/followup_preview.rhtml +++ b/app/views/request/followup_preview.rhtml @@ -43,7 +43,7 @@ <p> <%= hidden_field_tag(:submitted_followup, 1) %> <%= hidden_field_tag(:preview, 0 ) %> - <% if @internal_review %> + <% if @internal_review_pass_on %> <%= hidden_field_tag(:internal_review, 1 ) %> <% end %> <%= submit_tag "Re-edit this message", :name => 'reedit' %> @@ -11,8 +11,6 @@ Improve message on entering not_held - offer option of internal review. If you've already conducted an internal review, at all places offer link through to ICO submitting help page instead. -Change preview when you've chosen the internal review radio button - Improve look and text when you enter unhappy from choosing partial or rejection Change internal review request subject to something else |