diff --git a/CHANGELOG.md b/CHANGELOG.md index af0f708510..873ebd8808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Bump Ruby to v3.1.4 and use `.ruby-version` in CI [#3566](https://github.com/DMPRoadmap/roadmap/pull/3566) - Enable session timeout after 90 minutes of inactivity [#3568](https://github.com/DMPRoadmap/roadmap/pull/3568) - Validate CSV Separator [#3569](https://github.com/DMPRoadmap/roadmap/pull/3569) +- Fix rendering of `confirm_merge` partial [#3567](https://github.com/DMPRoadmap/roadmap/pull/3567) ## v5.0.1 - Updated seeds.rb file for identifier_schemes to include context value and removed logo_url and idenitifier_prefix for Shibboleth (as it was causing issues with SSO). [#3525](https://github.com/DMPRoadmap/roadmap/pull/3525) diff --git a/app/controllers/super_admin/users_controller.rb b/app/controllers/super_admin/users_controller.rb index a27f528adb..c4b96141b7 100644 --- a/app/controllers/super_admin/users_controller.rb +++ b/app/controllers/super_admin/users_controller.rb @@ -91,7 +91,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: 'confirm_merge') } else # NO USER, re-render w/error? flash.now[:alert] = 'Unable to find user'