From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Nov 2011 17:38:11 +0000 (+0000)
Subject: Make /user/new handle already logged in users better
X-Git-Tag: live~6026
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/88bf67b0923b1376ae6320597c70ce65e5fb1073?ds=sidebyside

Make /user/new handle already logged in users better
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 92a602ff1..3622b037d 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -253,16 +253,21 @@ class UserController < ApplicationController
   def new
     @title = t 'user.new.title'
     @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
       # page, instead send them to the home page
-      redirect_to :controller => 'site', :action => 'index'
-    elsif not params['openid'].nil?
+      if @referer
+        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'
     end
   end