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

Don't redirect from user#terms to login if the user is logged in

Browse source
This commit is contained in:
Tom Hughes 2013-09-29 15:43:34 +01:00
parent 25720e3ee3
commit a8d65b8dbf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/user_controller.rb
View file

@ -30,7 +30,7 @@ class UserController < ApplicationController
if @user and @user.terms_agreed? if @user and @user.terms_agreed?
# Already agreed to terms, so just show settings # Already agreed to terms, so just show settings
redirect_to :action => :account, :display_name => @user.display_name redirect_to :action => :account, :display_name => @user.display_name
elsif session[:new_user].nil? elsif @user.nil? and session[:new_user].nil?
redirect_to :action => :login, :referer => request.fullpath redirect_to :action => :login, :referer => request.fullpath
end end
end end