Skip to content

Fix rendering of confirm_merge partial #3567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronskiba merged 2 commits into from
Oct 6, 2025
Merged

Fix rendering of confirm_merge partial #3567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d275a2
Fix rendering of `confirm_merge` partial
aaronskiba Apr 23, 2025
dc579d9
Update CHANGELOG.md
aaronskiba Oct 6, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/super_admin/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down