Merge pull request #3515 from DMPRoadmap/aaron/fix-confirm-merge-partial

johnpinto1 · web-flow · commit 4bbaa34fc064 · 2025-04-24T16:20:15.000+01:00
Fix rendering of `confirm_merge` partial
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 - Fix failing eslint workflow / upgrade `actions/checkout` & `actions/setup-node` to v3 [#3503](https://github.com/DMPRoadmap/roadmap/pull/3503)
+- Fix rendering of `confirm_merge` partial [#3515](https://github.com/DMPRoadmap/roadmap/pull/3515)
 
 ## v5.0.0
 
diff --git 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'

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ def search`
`91`	`91`	`# WHAT TO RETURN!?!?!`
`92`	`92`	`if @users.present? # found a user, or Users, submit for merge`
`93`	`93`	`render json: {`
`94`		`- form: render_to_string(partial: 'super_admin/users/confirm_merge.html.erb')`
	`94`	`+ form: render_to_string(partial: 'confirm_merge')`
`95`	`95`	`}`
`96`	`96`	`else # NO USER, re-render w/error?`
`97`	`97`	`flash.now[:alert] = 'Unable to find user'`