kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

update users controller

Browse source
This commit is contained in:
James Lopez 2017-06-14 17:41:19 +02:00
parent 1c14805ff1
commit 85b5a8cfa6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/admin/users_controller.rb
View file

@ -125,14 +125,17 @@ class Admin::UsersController < Admin::ApplicationController
respond_to do |format| respond_to do |format|
user.skip_reconfirmation! user.skip_reconfirmation!
if user.update_attributes(user_params_with_pass)
result = Users::UpdateService.new(current_user, @user, user_params_with_pass).execute
if result[:succcess]
format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' } format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
format.json { head :ok } format.json { head :ok }
else else
# restore username to keep form action url. # restore username to keep form action url.
user.username = params[:id] user.username = params[:id]
format.html { render "edit" } format.html { render "edit" }
format.json { render json: user.errors, status: :unprocessable_entity } format.json { render json: result[:message], status: result[:status] }
end end
end end
end end