diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-03-02 20:38:25 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-03-02 20:38:25 +0000 |
| commit | d5ca5146888f01d710091dc5ddb160cf653ffcbd (patch) | |
| tree | a50f6a339fdc66ddf2f593ad92a8fa2de08af6e3 | |
| parent | a010372458bc529075c9b4d6c89d2863be0503c3 (diff) | |
| download | redmine-d5ca5146888f01d710091dc5ddb160cf653ffcbd.tar.gz redmine-d5ca5146888f01d710091dc5ddb160cf653ffcbd.zip | |
Adds autologin param in openid return_to url (#3371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11521 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/account_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index a09633421..57d0c2004 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -176,7 +176,9 @@ class AccountController < ApplicationController end def open_id_authenticate(openid_url) - authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url, :method => :post) do |result, identity_url, registration| + back_url = signin_url(:autologin => params[:autologin]) + + authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => back_url, :method => :post) do |result, identity_url, registration| if result.successful? user = User.find_or_initialize_by_identity_url(identity_url) if user.new_record? |