use :assigns instead of @-starting keys in :locals in render_to_string

cat-in-136 · Aug 3, 2024 · a978fbe · a978fbe
1 parent 59f151e
commit a978fbe
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/redmine_hearts/view_hook.rb b/lib/redmine_hearts/view_hook.rb
@@ -25,7 +25,8 @@ def view_layouts_base_html_head(context={})
       if subject
         controller.send(:render_to_string, {
           :partial => "hooks/redmine_hearts/view_layouts_base_html_head",
-          :locals => context.merge(:@heartable => subject)
+          :locals => context,
+          :assigns => { :heartable => subject }
         })
       end
     end
@@ -36,7 +37,8 @@ def view_layouts_base_content(context={})
       if subject
         controller.send(:render_to_string, {
           :partial => "hooks/redmine_hearts/view_layouts_base_content",
-          :locals => context.merge(:@heartable => subject)
+          :locals => context,
+          :assigns => { :heartable => subject }
         })
       end
     end
@@ -47,7 +49,8 @@ def view_account_left_bottom(context={})
         controller = context[:controller]
         controller.send(:render_to_string, {
           :partial => "hooks/redmine_hearts/view_account_left_bottom",
-          :locals => context.merge(:@heart_count => heart_count)
+          :locals => context,
+          :assigns => { :heart_count => heart_count }
         })
       end
     end