Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-17 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix redirect to home page after open signup

Browse source 
Fixes #1349
This commit is contained in:
Dan Rice 2012-11-29 15:09:37 -05:00
parent 4d2f25ab20
commit c838272622
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/users_controller.rb
View file

@ -99,13 +99,14 @@ class UsersController < ApplicationController
return
end
signup_by_admin = true if (@user && @user.is_admin?)
first_user_signing_up = User.no_users_yet?
user.is_admin = true if first_user_signing_up
if user.save
@user = User.authenticate(user.login, params['user']['password'])
@user.create_preference({:locale => I18n.locale})
@user.save
session['user_id'] = @user.id if first_user_signing_up
session['user_id'] = @user.id unless signup_by_admin
notify :notice, t('users.signup_successful', :username => @user.login)
redirect_back_or_home
end

17
test/integration/stories_test.rb
View file

@ -14,10 +14,25 @@ class StoriesTest < ActionController::IntegrationTest
end
def test_signup_new_user_by_nonadmin
SITE_CONFIG['open_signups'] = false
other_user = new_session_as(:other_user,"sesame")
other_user.goes_to_signup_as_nonadmin
end
def test_open_signup_new_user
SITE_CONFIG['open_signups'] = true
get "/signup"
assert_response :success
assert_template "users/new"
post "/users", :user => {:login => "newbie",
:password => "newbiepass",
:password_confirmation => "newbiepass"}
assert_response :redirect
follow_redirect!
assert_response :success
assert_template "todos/index"
end
private
module CustomAssertions
@ -72,4 +87,4 @@ class StoriesTest < ActionController::IntegrationTest
end
end
end
end