Gitlink
/
forgeplus
37
1
Fork 58
Code Issues 1 Pull Requests 1 Packages Releases 15 Wiki Activity

fix

This commit is contained in:
vilet.yy 2021-06-04 18:43:12 +08:00
parent c211c38d87
commit e8f4b3f17c
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/users_controller.rb
View File

@ -74,18 +74,10 @@ class UsersController < ApplicationController
def update def update
return render_not_found unless @user = User.find_by_id(params[:id]) || User.find_by(login: params[:id]) return render_not_found unless @user = User.find_by_id(params[:id]) || User.find_by(login: params[:id])
<<<<<<< HEAD
Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
@user.attributes = user_params.except(:image)
if @user.save
render_ok
else
=======
return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id) return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
Util.write_file(@image, avatar_path(@user)) if user_params[:image].present? Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
@user.attributes = user_params.except(:image) @user.attributes = user_params.except(:image)
unless @user.save unless @user.save
>>>>>>> ed8d646d479bdcd84784909a024949bb8e4f093f
render_error(@user.errors.full_messages.join(", ")) render_error(@user.errors.full_messages.join(", "))
end end
end end