diff options
| author | David Cabo <david@calibea.com> | 2011-08-23 02:32:40 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-23 02:32:40 +0200 |
| commit | 6f46c15f6290e286ffa7b12ace40e4983c6641a3 (patch) | |
| tree | 2474f497a6eadd06db8c299f143aac106f4fe678 /app/controllers/request_controller.rb | |
| parent | 6e2f34a888b99cc9b84b8ec158d6cbb4b76e47f6 (diff) | |
Move compulsory sign-in step after Preview page, where it was originally
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 ffdcbe62c..6e562d97d 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -287,15 +287,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 - # Show preview page, if it is a preview if params[:preview].to_i == 1 message = "" @@ -318,6 +309,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 + @info_request.user = authenticated_user # This automatically saves dependent objects, such as @outgoing_message, in the same transaction @info_request.save! |