kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Log the user in after registration if account activation is not needed. 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1521 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-06-09 18:59:15 +00:00
parent 80a7486f95
commit 19cb6f96f4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/account_controller.rb
View File

@ -134,8 +134,9 @@ class AccountController < ApplicationController
# Automatic activation # Automatic activation
@user.status = User::STATUS_ACTIVE @user.status = User::STATUS_ACTIVE
if @user.save if @user.save
self.logged_user = @user
flash[:notice] = l(:notice_account_activated) flash[:notice] = l(:notice_account_activated)
redirect_to :action => 'login' redirect_to :controller => 'my', :action => 'account'
end end
else else
# Manual activation by the administrator # Manual activation by the administrator

8
test/integration/account_test.rb
View File

@ -67,8 +67,12 @@ class AccountTest < ActionController::IntegrationTest
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
:password => "newpass", :password_confirmation => "newpass" :password => "newpass", :password_confirmation => "newpass"
assert_redirected_to 'account/login' assert_redirected_to 'my/account'
log_user('newuser', 'newpass') follow_redirect!
assert_response :success
assert_template 'my/account'
assert User.find_by_login('newuser').active?
end end
def test_register_with_manual_activation def test_register_with_manual_activation