X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..d24312fa8c79a370faa33c23c9bf3719c9931857:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index df6ca164c..2f22ad940 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -16,6 +16,8 @@ class UserController < ApplicationController
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
+  cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+
   def save
     @title = t 'user.new.title'
 
@@ -65,12 +67,20 @@ class UserController < ApplicationController
         set_locale
 
         if params[:user][:email] == @user.new_email
-          flash[:notice] = t 'user.account.flash update success confirm needed'
+          flash.now[:notice] = t 'user.account.flash update success confirm needed'
           Notifier.deliver_email_confirm(@user, @user.tokens.create)
         else
-          flash[:notice] = t 'user.account.flash update success'
+          flash.now[:notice] = t 'user.account.flash update success'
+        end
+      end
+    else
+      if flash[:errors]
+        flash[:errors].each do |attr,msg|
+          @user.errors.add(attr,msg)
         end
       end
+
+      @user.email = @user.new_email if @user.new_email
     end
   end
 
@@ -101,9 +111,9 @@ class UserController < ApplicationController
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
-        @notice = t 'user.lost_password.notice email on way'
+        flash.now[:notice] = t 'user.lost_password.notice email on way'
       else
-        @notice = t 'user.lost_password.notice email cannot find'
+        flash.now[:error] = t 'user.lost_password.notice email cannot find'
       end
     end
   end
@@ -130,7 +140,7 @@ class UserController < ApplicationController
           end
         end
       else
-        flash[:notice] = t 'user.reset_password.flash token bad'
+        flash[:error] = t 'user.reset_password.flash token bad'
         redirect_to :action => 'lost_password'
       end
     end
@@ -152,9 +162,9 @@ class UserController < ApplicationController
       if user
         session[:user] = user.id
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        @notice = t 'user.login.account not active'
+        flash.now[:error] = t 'user.login.account not active'
       else
-        @notice = t 'user.login.auth failure'
+        flash.now[:error] = t 'user.login.auth failure'
       end
     end
 
@@ -211,7 +221,7 @@ class UserController < ApplicationController
           redirect_to :action => 'account', :display_name => @user.display_name
         end
       else
-        @notice = t 'user.confirm.failure'
+        flash.now[:error] = t 'user.confirm.failure'
       end
     end
   end
@@ -225,13 +235,16 @@ class UserController < ApplicationController
         @user.new_email = nil
         @user.active = true
         @user.email_valid = true
-        @user.save!
+        if @user.save
+          flash[:notice] = t 'user.confirm_email.success'
+        else
+          flash[:errors] = @user.errors
+        end
         token.destroy
-        flash[:notice] = t 'user.confirm_email.success'
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
-        @notice = t 'user.confirm_email.failure'
+        flash.now[:error] = t 'user.confirm_email.failure'
       end
     end
   end
@@ -284,7 +297,7 @@ class UserController < ApplicationController
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else
-        flash[:notice] = t 'user.make_friend.already_a_friend', :name => name
+        flash[:warning] = t 'user.make_friend.already_a_friend', :name => name
       end
 
       redirect_to :controller => 'user', :action => 'view'
@@ -299,7 +312,7 @@ class UserController < ApplicationController
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       else
-        flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
+        flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
       end
 
       redirect_to :controller => 'user', :action => 'view'
@@ -346,7 +359,7 @@ private
   # and return them to the user page.
   def require_administrator
     unless @user.administrator?
-      flash[:notice] = t('user.filter.not_an_administrator')
+      flash[:error] = t('user.filter.not_an_administrator')
       redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
     end
   end