diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 11 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index dfd44f32b..ca00da9ab 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_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: admin_request_controller.rb,v 1.34 2009-04-08 16:13:11 louise Exp $ +# $Id: admin_request_controller.rb,v 1.35 2009-06-15 14:42:11 francis Exp $ class AdminRequestController < AdminController def index @@ -45,7 +45,8 @@ class AdminRequestController < AdminController old_prominence = @info_request.prominence old_described_state = @info_request.described_state old_awaiting_description = @info_request.awaiting_description - old_stop_new_responses = @info_request.stop_new_responses + old_allow_new_responses_from = @info_request.allow_new_responses_from + old_handle_rejected_responses = @info_request.handle_rejected_responses @info_request.title = params[:info_request][:title] @info_request.prominence = params[:info_request][:prominence] @@ -53,7 +54,8 @@ class AdminRequestController < AdminController @info_request.set_described_state(params[:info_request][:described_state]) end @info_request.awaiting_description = params[:info_request][:awaiting_description] == "true" ? true : false - @info_request.stop_new_responses = params[:info_request][:stop_new_responses] == "true" ? true : false + @info_request.allow_new_responses_from = params[:info_request][:allow_new_responses_from] + @info_request.handle_rejected_responses = params[:info_request][:handle_rejected_responses] if @info_request.valid? @info_request.save! @@ -63,7 +65,8 @@ class AdminRequestController < AdminController :old_prominence => old_prominence, :prominence => @info_request.prominence, :old_described_state => old_described_state, :described_state => @info_request.described_state, :old_awaiting_description => old_awaiting_description, :awaiting_description => @info_request.awaiting_description, - :old_stop_new_responses => old_stop_new_responses, :stop_new_responses => @info_request.stop_new_responses + :old_allow_new_responses_from => old_allow_new_responses_from, :allow_new_responses_from => @info_request.allow_new_responses_from, + :old_handle_rejected_responses => old_handle_rejected_responses, :handle_rejected_responses => @info_request.handle_rejected_responses }) flash[:notice] = 'Request successfully updated.' redirect_to request_admin_url(@info_request) diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 8316eebf3..97181ddf7 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.160 2009-06-12 13:53:45 francis Exp $ +# $Id: request_controller.rb,v 1.161 2009-06-15 14:42:11 francis Exp $ class RequestController < ApplicationController @@ -451,7 +451,7 @@ class RequestController < ApplicationController end if !params[:submitted_followup].nil? && !params[:reedit] - if @info_request.stop_new_responses + if @info_request.allow_new_responses_from == 'nobody' flash[:error] = 'Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href="/help/contact">contact us</a> if you really want to send a follow up message.' else # See if values were valid or not |