diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
| commit | 7f0ae82d44873b53cc87c659b42415ce4866c7b4 (patch) | |
| tree | fdce14b0658bb05aef087dd4e09dc25c9a79ea8c /app/controllers/application_controller.rb | |
| parent | 2926ee877bcf8974c529e1271ded42971fe0d632 (diff) | |
| parent | 96c4dd912083edcd0c9eda76bd2301bb4a1a6d53 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop, fix conflicts
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a2a628f10..3794043fb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -211,7 +211,9 @@ class ApplicationController < ActionController::Base post_redirect = PostRedirect.new(:uri => request.request_uri, :post_params => params, :reason_params => reason_params) post_redirect.save! - redirect_to signin_url(:token => post_redirect.token) + # 'modal' controls whether the sign-in form will be displayed in the typical full-blown + # page or on its own, useful for pop-ups + redirect_to signin_url(:token => post_redirect.token, :modal => params[:modal]) return false end return true |