Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-07 11:07:11 +02:00
Code Issues Packages Projects Releases Activity

Merge r24387 from trunk to 6.0-stable (#43668).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@24391 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2026-01-30 02:38:46 +00:00
parent ea9396f6ff
commit f8e8ce0a7f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/email_addresses_controller.rb
View File

@@ -30,10 +30,13 @@ class EmailAddressesController < ApplicationController
def create
saved = false
if @user.email_addresses.count <= Setting.max_additional_emails.to_i
@address = EmailAddress.new(:user => @user, :is_default => false)
@address.safe_attributes = params[:email_address]
saved = @address.save
User.transaction do
@user.reload(lock: true)
if @user.email_addresses.count <= Setting.max_additional_emails.to_i
@address = EmailAddress.new(:user => @user, :is_default => false)
@address.safe_attributes = params[:email_address]
saved = @address.save
end
end
respond_to do |format|