Skip to content
Snippets Groups Projects

Clean up users controller for password updates.

2 files
+ 22
26
Compare changes
  • Side-by-side
  • Inline

Files

@@ -58,7 +58,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def update_user
if @user.update params[:user][:password].to_s.empty? ? user_params : user_params_pwd
if @user.update user_params
flash[:success] = "Succesfully updated user"
redirect_to admin_user_path(@user)
else
@@ -118,23 +118,21 @@ class Admin::UsersController < Admin::ApplicationController
protected
def user_params
params.require(:user).permit(
prms = params.require(:user).permit(
:first_name,
:last_name,
:email,
:authorization_level
)
end
def user_params_pwd
params.require(:user).permit(
:first_name,
:last_name,
:password,
:password_confirmation,
:email,
:authorization_level
)
if prms[:password].blank?
prms.delete :password
prms.delete :password_confirmation
end
prms
end
def group_params
Loading