Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ def create
end

def show
@user = User.find(id_param).decorate
@user = User.find(params[:id]).decorate
end

def edit
@user = User.find(id_param)
@user = User.find(params[:id])
if can_access_page?
@project_users = @user.project_users
render :edit
Expand Down Expand Up @@ -56,7 +56,7 @@ def update_password
end

def update
@user = User.find(id_param)
@user = User.find(params[:id])
if can_access_page?
set_password unless password_param.empty?

Expand Down Expand Up @@ -95,10 +95,6 @@ def can_access_page?
# )
# end

# def id_param
# params[:id]
# end

# def password_param
# params[:user][:password]
# end
Expand Down