diff options
| author | David Cabo <david@calibea.com> | 2011-08-22 22:51:54 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-22 22:51:54 +0200 |
| commit | 349163c4de2d0cfe52c12ef41dae62f8555cf9c3 (patch) | |
| tree | eab8ec871290e9db117890ac4729e0484249644f /app/controllers/application_controller.rb | |
| parent | 88b9e2c08526983fcf5985fdd2fcdf420f45f51c (diff) | |
| parent | 6c692dea355ea2a057a01e795466a19f81b494aa (diff) | |
Merge branch 'asktheeu' into asktheeu-new-design
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 0df3e22da..8ef23f49d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -192,7 +192,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 |