cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preserve the referer at the end of account creation

Browse source
This commit is contained in:
Tom Hughes 2011-04-03 11:22:39 +01:00
parent 097fb390b8
commit 4b20afd51e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/user_controller.rb
View file

@ -95,9 +95,9 @@ class UserController < ApplicationController
flash[:notice] = t 'user.new.flash create success message', :email => @user.email flash[:notice] = t 'user.new.flash create success message', :email => @user.email
Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer])) Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
session[:token] = @user.tokens.create.token session[:token] = @user.tokens.create.token
redirect_to :action => 'login' redirect_to :action => 'login', :referer => params[:referer]
else else
render :action => 'new' render :action => 'new', :referer => params[:referer]
end end
end end
end end

2
test/functional/user_controller_test.rb
View file

@ -43,7 +43,7 @@ class UserControllerTest < ActionController::TestCase
assert_match /#{@url}/, register_email.body assert_match /#{@url}/, register_email.body
# Check the page # Check the page
assert_redirected_to :action => 'login' assert_redirected_to :action => 'login', :referer => nil
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
end end