kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #43918 from ghiculescu/link-to-model-twice

Browse source 
Fix `link_to` with a model passed as an argument twice
This commit is contained in:
Rafael Mendonça França 2021-12-20 17:44:16 -05:00 committed by GitHub
commit db56042f33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
actionview/lib/action_view/helpers/url_helper.rb
View file

@ -208,7 +208,6 @@ module ActionView
#
def link_to(name = nil, options = nil, html_options = nil, &block)
html_options, options, name = options, name, block if block_given?
options ||= {}
html_options = convert_options_to_data_attributes(options, html_options)
@ -743,7 +742,7 @@ module ActionView
end
def url_target(name, options)
if name.respond_to?(:model_name) && options.empty?
if name.respond_to?(:model_name) && options.is_a?(Hash) && options.empty?
url_for(name)
else
url_for(options)

10
actionview/test/template/url_helper_test.rb
View file

@ -16,7 +16,7 @@ class Workshop
end
def to_s
id.to_s
"Workshop #{id}"
end
end
@ -621,7 +621,13 @@ class UrlHelperTest < ActiveSupport::TestCase
def test_link_tag_using_active_record_model
@workshop = Workshop.new(1.to_s)
link = link_to(@workshop)
assert_dom_equal %{<a href="/workshops/1">1</a>}, link
assert_dom_equal %{<a href="/workshops/1">Workshop 1</a>}, link
end
def test_link_tag_using_active_record_model_twice
@workshop = Workshop.new(1.to_s)
link = link_to(@workshop, @workshop)
assert_dom_equal %{<a href="/workshops/1">Workshop 1</a>}, link
end
def test_link_to_unless