diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application.rb | 15 | ||||
| -rw-r--r-- | app/controllers/body_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/help_controller.rb | 33 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 15 |
4 files changed, 53 insertions, 13 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index ae2c8dd6f..c6f346907 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.50 2008-09-12 08:26:04 francis Exp $ +# $Id: application.rb,v 1.51 2008-10-07 22:05:06 francis Exp $ class ApplicationController < ActionController::Base @@ -213,12 +213,19 @@ class ApplicationController < ActionController::Base return InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) end + # Store last visited pages, for contact form + def set_last_request(info_request) + session[:last_request_id] = info_request.id + session[:last_body_id] = nil + end + def set_last_body(public_body) + session[:last_request_id] = nil + session[:last_body_id] = public_body.id + end + # URL generating functions are needed by all controllers (for redirects), # views (for links) and mailers (for use in emails), so include them into # all of all. include LinkToHelper end - - - diff --git a/app/controllers/body_controller.rb b/app/controllers/body_controller.rb index b2addd045..1b113252f 100644 --- a/app/controllers/body_controller.rb +++ b/app/controllers/body_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: body_controller.rb,v 1.17 2008-09-13 15:35:37 francis Exp $ +# $Id: body_controller.rb,v 1.18 2008-10-07 22:05:06 francis Exp $ class BodyController < ApplicationController # XXX tidy this up with better error messages, and a more standard infrastructure for the redirect to canonical URL @@ -32,6 +32,7 @@ class BodyController < ApplicationController redirect_to show_public_body_url(:url_name => @public_bodies[0].url_name) end @public_body = @public_bodies[0] + set_last_body(@public_body) @track_thing = TrackThing.create_track_for_public_body(@public_body) @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss] } ] diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 0ba7da12d..5fc039b3e 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: help_controller.rb,v 1.8 2008-10-03 17:48:37 francis Exp $ +# $Id: help_controller.rb,v 1.9 2008-10-07 22:05:06 francis Exp $ class HelpController < ApplicationController @@ -15,24 +15,51 @@ class HelpController < ApplicationController @contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') @contact_email = @contact_email.gsub(/@/, "@") + # if they clicked remove for link to request/body, remove it + if params[:remove] + @last_request = nil + session[:last_request_id] = nil + session[:last_body_id] = nil + end + + # look up link to request/body + @last_request_id = session[:last_request_id].to_i + if @last_request_id > 0 + @last_request = InfoRequest.find(@last_request_id) + else + @last_request = nil + end + @last_body_id = session[:last_body_id].to_i + if @last_body_id > 0 + @last_body = PublicBody.find(@last_body_id) + else + @last_body = nil + end + + # submit form if params[:submitted_contact_form] if @user params[:contact][:email] = @user.email params[:contact][:name] = @user.name end @contact = ContactValidator.new(params[:contact]) - if @contact.valid? + if @contact.valid? && !params[:remove] ContactMailer.deliver_message( params[:contact][:name], params[:contact][:email], params[:contact][:subject], params[:contact][:message], - @user + @user, + @last_request, @last_body ) flash[:notice] = "Your message has been sent. Thank you for getting in touch! We'll get back to you soon." redirect_to frontpage_url return end + + if params[:remove] + @contact.errors.clear + end end end diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index bb3bd8b85..2b6ff0400 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.117 2008-10-03 17:09:05 francis Exp $ +# $Id: request_controller.rb,v 1.118 2008-10-07 22:05:06 francis Exp $ class RequestController < ApplicationController @@ -15,9 +15,10 @@ class RequestController < ApplicationController redirect_to request_url(@info_request) return end - + # Look up by new style text names @info_request = InfoRequest.find_by_url_title(params[:url_title]) + set_last_request(@info_request) # Other parameters @info_request_events = @info_request.info_request_events @@ -195,7 +196,8 @@ class RequestController < ApplicationController # Describing state of messages post here def describe_state - @info_request = InfoRequest.find(params[:id]) + @info_request = InfoRequest.find(params[:id].to_i) + set_last_request(@info_request) # special case that an admin user can edit requires_admin requests @requires_admin_describe = (@info_request.described_state == 'requires_admin') && !authenticated_user.nil? && authenticated_user.requires_admin_power? @@ -270,8 +272,8 @@ class RequestController < ApplicationController elsif @info_request.calculate_status == 'gone_postal' redirect_to respond_to_last_url(@info_request) + "?gone_postal=1" elsif @info_request.calculate_status == 'requires_admin' - flash[:notice] = "Thanks! The WhatDoTheyKnow team have been notified. <a href=\"/help/contact\">Contact us</a> if you have more to say about how we should handle this." - redirect_to request_url(@info_request) + flash[:notice] = "Please use the form below to tell us details about what is unusual about the response." + redirect_to help_general_url(:action => 'contact') else raise "unknown calculate_status " + @info_request.calculate_status end @@ -303,7 +305,10 @@ class RequestController < ApplicationController else @incoming_message = IncomingMessage.find(params[:incoming_message_id]) end + @info_request = InfoRequest.find(params[:id].to_i) + set_last_request(@info_request) + @collapse_quotes = params[:unfold] ? false : true @is_owning_user = !authenticated_user.nil? && (authenticated_user.id == @info_request.user_id || authenticated_user.owns_every_request?) @gone_postal = params[:gone_postal] ? true : false |