Skip to content

Commit

Permalink
Merge pull request #670 from CDLUC3/bug/BR-config
Browse files Browse the repository at this point in the history
fix issue with rendering merge user partial
  • Loading branch information
briri authored Dec 10, 2024
2 parents fa34641 + 9ac3140 commit d706c70
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/super_admin/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def search
# WHAT TO RETURN!?!?!
if @users.present? # found a user, or Users, submit for merge
render json: {
form: render_to_string(partial: 'super_admin/users/confirm_merge.html.erb')
form: render_to_string(partial: 'super_admin/users/confirm_merge')
}
else # NO USER, re-render w/error?
flash.now[:alert] = 'Unable to find user'
Expand Down

0 comments on commit d706c70

Please sign in to comment.