diff options
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 44c93471df4..0443e8b89ef 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -59,15 +59,17 @@ class Admin::UsersController < Admin::ApplicationController end def update + user_params_with_pass = user_params.dup + if params[:user][:password].present? - user_params.merge( + user_params_with_pass.merge!( password: params[:user][:password], password_confirmation: params[:user][:password_confirmation], ) end respond_to do |format| - if user.update_attributes(user_params) + if user.update_attributes(user_params_with_pass) user.confirm! format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' } format.json { head :ok } |