From 40e6f437e8197f9fa5ad6c9ce87c9ec062b889bf Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 20 Jun 2011 22:17:53 -0700 Subject: [PATCH 1/2] Allow additional link relations when using method attribute with link_to --- actionpack/lib/action_view/helpers/url_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 489b96856d..8cb22df280 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -619,7 +619,9 @@ module ActionView end def add_method_to_attributes!(html_options, method) - html_options["rel"] = "nofollow" if method.to_s.downcase != "get" + if method && method.to_s.downcase != "get" + html_options["rel"] = "#{html_options["rel"].to_s} nofollow".split(" ").uniq.join(" ") + end html_options["data-method"] = method end From 9c1d0d88a7bab0b0bc0d39748458bbeb327b7725 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 21 Jun 2011 07:49:10 -0700 Subject: [PATCH 2/2] Adds a test to check link_to with method & rel options --- actionpack/test/template/url_helper_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 1e54f0174c..a70c02a429 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -245,6 +245,13 @@ class UrlHelperTest < ActiveSupport::TestCase ) end + def test_link_tag_using_post_javascript_and_rel + assert_dom_equal( + "Hello", + link_to("Hello", "http://www.example.com", :method => :post, :rel => 'example') + ) + end + def test_link_tag_using_post_javascript_and_confirm assert_dom_equal( "Hello",