]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/user_controller.rb
Make it a bit clear when you try and login with openID and your openID isn't associat...
[rails.git] / app / controllers / user_controller.rb
index f9755204a27b4c0dfb6d64484d9cb41d4e2b5571..cc12cc9e74ca2f3d69540cd39911b014cb3533ca 100644 (file)
@@ -133,6 +133,8 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
+      @user.openid_url = nil if (params[:user][:openid_url].length == 0)
+
       if @user.save
         set_locale
 
@@ -320,6 +322,10 @@ class UserController < ApplicationController
     @nickname = params['nickname']
     @email = params['email']
     @openID = params['openid']
+       
+    if !params['openid'].nil?
+         flash.now[:notice] = t 'user.new.openID association'
+       end
   end
 
   def login