diff options
| author | David Cabo <david@calibea.com> | 2011-09-01 02:46:22 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-09-01 02:46:22 +0200 |
| commit | 6a7c9cdd3c5bf3db7701ef1353f04527e96c8cc3 (patch) | |
| tree | 59cfc21e66fc3c44eb01991ef03f253dcaaf010d /app/controllers/application_controller.rb | |
| parent | 1fb99a4df2514cb6aea37fcf1fd4790234d77c7e (diff) | |
| parent | 88c26439d7d00cc5f0e1ddcb7b0a0036fa3f9c88 (diff) | |
Merge branch 'asktheeu-new-design' into develop (update New Request workflow to match new wireframes)
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 6d14d0d7a..9133f701b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -199,7 +199,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 |