Merge pull request '用户修改昵称纳入关键词保留' (#82) from KingChan/forgeplus:chenjing into standalone_develop
This commit is contained in:
commit
15c584625a
|
@ -212,6 +212,7 @@ class UsersController < ApplicationController
|
|||
def update
|
||||
return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id])
|
||||
return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
|
||||
return normal_status(-1, "昵称无法使用以下关键词:#{user_params[:nickname]},请重新命名") if ReversedKeyword.check_exists?(user_params[:nickname])
|
||||
Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
|
||||
@user.attributes = user_params.except(:image)
|
||||
unless @user.save
|
||||
|
|
Loading…
Reference in New Issue