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

Redirect after saving settings in case the username has changed

Browse source 
Fixes #3059
This commit is contained in:
Tom Hughes 2021-01-19 18:24:41 +00:00
parent d58b74a685
commit 812f5b44e8
3 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/users_controller.rb
View file

@ -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])
@ -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