Merge pull request #2409 from jalessio/docker-compose-take2

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7f12720a6efeb8c3110f3bbde92be78efb03f0bf..a1129339eb71d7e0d5fe14a34f9a014a5d4b2eee 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -128,6 +128,7 @@ class UsersController < ApplicationController
          (params[:user][:auth_provider] == current_user.auth_provider &&
           params[:user][:auth_uid] == current_user.auth_uid)
         update_user(current_user, params)
+        redirect_to user_account_url(current_user) if current_user.errors.count.zero?
       else
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
@@ -259,7 +260,7 @@ class UsersController < ApplicationController
       elsif current_user.auth_provider.present?
         # Verify external authenticator before moving on
         session[:new_user] = current_user
-        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid)
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect
       else
         # Save the user record
         session[:new_user] = current_user
@@ -461,6 +462,8 @@ class UsersController < ApplicationController
 
       update_user(current_user, settings)
 
+      flash.discard
+
       session[:user_errors] = current_user.errors.as_json
 
       redirect_to :action => "account", :display_name => current_user.display_name
@@ -655,12 +658,12 @@ class UsersController < ApplicationController
       set_locale(:reset => true)
 
       if user.new_email.blank? || user.new_email == user.email
-        flash.now[:notice] = t "users.account.flash update success"
+        flash[:notice] = t "users.account.flash update success"
       else
         user.email = user.new_email
 
         if user.valid?
-          flash.now[:notice] = t "users.account.flash update success confirm needed"
+          flash[:notice] = t "users.account.flash update success confirm needed"
 
           begin
             UserMailer.email_confirm(user, user.tokens.create).deliver_later