Browse Source

fixed 修改用户参数校验错误

pull/343/head
xxqfamous 3 years ago
parent
commit
b6448d127d
2 changed files with 3 additions and 5 deletions
  1. +2
    -4
      app/controllers/accounts_controller.rb
  2. +1
    -1
      app/services/admins/import_user_from_excel_service.rb

+ 2
- 4
app/controllers/accounts_controller.rb View File

@@ -4,12 +4,11 @@ class AccountsController < ApplicationController

#skip_before_action :check_account, :only => [:logout]

def simple_update
def simple_update
simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, ""))
simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, ""))
simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, ""))
simple_update_params.merge!(user_id: current_user.id)
Register::RemoteForm.new(simple_update_params).validate!
Register::RemoteForm.new(simple_update_params.merge(user_id: current_user.id)).validate!

ActiveRecord::Base.transaction do
result = auto_update(current_user, simple_update_params)
@@ -28,7 +27,6 @@ class AccountsController < ApplicationController

# 其他平台同步注册的用户
def remote_register
remote_register_params.merge!(user_id: nil)
Register::RemoteForm.new(remote_register_params).validate!
username = params[:username]&.gsub(/\s+/, "")
tip_exception("无法使用以下关键词:#{username},请重新命名") if ReversedKeyword.check_exists?(username)


+ 1
- 1
app/services/admins/import_user_from_excel_service.rb View File

@@ -45,7 +45,7 @@ class Admins::ImportUserFromExcelService < ApplicationService
password = data.password
nickname = data.nickname&.gsub(/\s+/, "")
raise Error, "无法使用以下关键词:#{username},请重新命名" if ReversedKeyword.check_exists?(data.login)
Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge', user_id: nil}).validate!
Register::RemoteForm.new({username: username, email: email, password: password, platform: 'forge'}).validate!
user = User.new(admin: false, login: username, mail: email, nickname: nickname, platform: 'forge' , type: "User")
user.password = password
user.activate


Loading…
Cancel
Save