aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application.rb4
-rw-r--r--app/controllers/request_controller.rb7
2 files changed, 7 insertions, 4 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 2affefa96..1410aff29 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.17 2007-10-30 18:52:27 francis Exp $
+# $Id: application.rb,v 1.18 2007-10-31 12:14:20 francis Exp $
class ApplicationController < ActionController::Base
@@ -89,7 +89,7 @@ class ApplicationController < ActionController::Base
# Check the user is logged in
def authenticated?
unless session[:user]
- session[:intended_uri] = @request.request_uri
+ session[:intended_uri] = request.request_uri
session[:intended_params] = params
redirect_to signin_url
return false
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index a935983ac..2756b9452 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.9 2007-10-30 17:31:31 francis Exp $
+# $Id: request_controller.rb,v 1.10 2007-10-31 12:14:20 francis Exp $
class RequestController < ApplicationController
@@ -47,9 +47,12 @@ class RequestController < ApplicationController
@outgoing_message.send_message
flash[:notice] = "Your Freedom of Information request has been created and sent on its way."
redirect_to show_request_url(:id => @info_request)
+ else
+ # do nothing - as "authenticated?" has done the redirect to signin page for us
end
- # Save both models
+ # Save both models # XXX still fiddling with error reporting here, see Louise's
+ # email about some better error reporting plugin.
# valid = @info_request.valid?
# valid &&= @outgoing_message.valid? # XXX maybe there is a nicer way of preventing lazy boolean evaluation than this
# if valid