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

Make /user/new handle already logged in users better

Browse source
This commit is contained in:
Tom Hughes 2011-11-07 17:38:11 +00:00
parent 0e33245b1d
commit 88bf67b092
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/user_controller.rb
View file

@ -253,16 +253,21 @@ class UserController < ApplicationController
def new def new
@title = t 'user.new.title' @title = t 'user.new.title'
@referer = params[:referer] || session[:referer] @referer = params[:referer] || session[:referer]
@user = User.new(:email => params[:email],
:email_confirmation => params[:email],
:display_name => params[:nickname],
:openid_url => params[:openid])
if session[:user] if @user
# The user is logged in already, so don't show them the signup # The user is logged in already, so don't show them the signup
# page, instead send them to the home page # page, instead send them to the home page
redirect_to :controller => 'site', :action => 'index' if @referer
elsif not params['openid'].nil? redirect_to @referer
else
redirect_to :controller => 'site', :action => 'index'
end
elsif params.key?(:openid)
@user = User.new(:email => params[:email],
:email_confirmation => params[:email],
:display_name => params[:nickname],
:openid_url => params[:openid])
flash.now[:notice] = t 'user.new.openid association' flash.now[:notice] = t 'user.new.openid association'
end end
end end