Changeset 4370

Timestamp:

05/28/06 00:33:53 (3 years ago)

Author:

david

Message:

Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/url_helper.rb (modified) (4 diffs)
• trunk/actionpack/test/template/url_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [DHH]
-
-* follow_redirect doesn't complain about being redirected to the same controller. #5153 [dymo@mk.ukrtelecom.ua]

trunk/actionpack/lib/action_view/helpers/url_helper.rb

@@ -39 +39 @@
-      # Javascript form.
-      #
-
-
-
-
+
+
+
+
+
-      #
-      # Examples:
@@ -48 +49 @@
-      #   link_to "Help", { :action => "help" }, :popup => true
-      #   link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
-post => tru
+method => :delet
-      def link_to(name, options = {}, html_options = nil, *parameters_for_method_reference)
-        if html_options
@@ -250 +251 @@
-      private
-        def convert_options_to_javascript!(html_options)
-
+
+
+
+
+
-        
-          html_options["onclick"] = case
-post
+method
-              raise ActionView::ActionViewError, "You can't use :popup and :post in the same link"
-            when confirm && popup
-              "if (#{confirm_javascript_function(confirm)}) { #{popup_javascript_function(popup)} };return false;"
-post
-post_javascript_function
+method
+method_javascript_function(method)
-            when confirm
-              "return #{confirm_javascript_function(confirm)};"
-post
-post_javascript_function
+method
+method_javascript_function(method)
-            when popup
-              popup_javascript_function(popup) + 'return false;'
@@ -278 +283 @@
-        end
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
-        end
-

trunk/actionpack/test/template/url_helper_test.rb

@@ -128 +128 @@
-  def test_link_tag_using_post_javascript
-    assert_dom_equal(
-\"http://www.example.com\" onclick=\"var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; 
+'http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;
-      link_to("Hello", "http://www.example.com", :post => true)
-    )
-  end
+
+  def test_link_tag_using_delete_javascript
+    assert_dom_equal(
+      "<a href='http://www.example.com' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit();return false;\">Destroy</a>",
+      link_to("Destroy", "http://www.example.com", :method => :delete)
+    )
+  end
-  
-  def test_link_tag_using_post_javascript_and_confirm
-    assert_dom_equal(
-this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; 
+f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;
-      link_to("Hello", "http://www.example.com", :post => true, :confirm => "Are you serious?")
-    )