diff options
| author | David Cabo <david@calibea.com> | 2011-08-11 03:50:10 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-11 03:50:10 +0200 |
| commit | a63e598b9e0ddfa7ac695b1be41aaace6c0eb628 (patch) | |
| tree | ac5ec3bca43d8194445292190c74124f1a0a8429 /app/controllers/request_controller.rb | |
| parent | 07933c860cea05df05acde5b5e321e2d78911f60 (diff) | |
Move log-in point to before Preview and fix modal sign-in and sign-up redirects
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index d39b78f36..88fb9be6c 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -276,6 +276,15 @@ class RequestController < ApplicationController return end + if !authenticated?( + :web => _("To send your FOI request"), + :email => _("Then your FOI request to {{public_body_name}} will be sent.",:public_body_name=>@info_request.public_body.name), + :email_subject => _("Confirm your FOI request to ") + @info_request.public_body.name + ) + # do nothing - as "authenticated?" has done the redirect to signin page for us + return + end + # Show preview page, if it is a preview if params[:preview].to_i == 1 message = "" @@ -298,15 +307,6 @@ class RequestController < ApplicationController return end - if !authenticated?( - :web => _("To send your FOI request"), - :email => _("Then your FOI request to {{public_body_name}} will be sent.",:public_body_name=>@info_request.public_body.name), - :email_subject => _("Confirm your FOI request to ") + @info_request.public_body.name - ) - # do nothing - as "authenticated?" has done the redirect to signin page for us - return - end - @info_request.user = authenticated_user # This automatically saves dependent objects, such as @outgoing_message, in the same transaction @info_request.save! |