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

Merge pull request #5689 from tomhughes/settings-fixes

Browse source 
User settings fixes
This commit is contained in:
Andy Allan 2025-02-16 14:17:44 +00:00 • committed by GitHub
commit e858cdc2b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View file

@ -31,7 +31,7 @@ class AccountsController < ApplicationController
(params[:user][:auth_provider] == current_user.auth_provider &&
params[:user][:auth_uid] == current_user.auth_uid)
update_user(current_user, user_params)
if current_user.errors.count.zero?
if current_user.errors.empty?
redirect_to edit_account_path
else
render :edit

5
app/controllers/concerns/user_methods.rb
View file

@ -59,8 +59,9 @@ module UserMethods
# Ignore errors sending email
end
else
current_user.errors.add(:new_email, current_user.errors[:email])
current_user.errors.add(:email, [])
current_user.errors.delete(:email).each do |error|
current_user.errors.add(:new_email, error)
end
end
user.restore_email!