floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修改remote_update

This commit is contained in:
sylor_huang@126.com 2020-04-15 11:47:00 +08:00
parent ca0c264cfc
commit 740477dcd2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -45,6 +45,8 @@ class AccountsController < ApplicationController
u = User.find_by(login: params[:old_user_login])
user_mail = u.try(:mail)
Rails.logger.info("#########_____update_user_params________#######{user_params}")
Rails.logger.info("#########_____update_user_extension_params________#######{user_extension_params}")
if u.present?
u.update_attributes(user_params)

2
app/models/user.rb
View File

@ -201,7 +201,7 @@ class User < ApplicationRecord
#
# validations
#
validates_presence_of :login, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }, case_sensitive: false
# validates_presence_of :login, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }, case_sensitive: false
validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, case_sensitive: false
# validates_uniqueness_of :phone, :if => Proc.new { |user| user.phone_changed? && user.phone.present? }, case_sensitive: false