Applied the dblack patch

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 32 insertions, 0 deletions

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index bed9eae244..36e1f946f8 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -137,6 +137,9 @@ module ActionView
       def initialize(object_name, method_name, template_object, local_binding = nil)
         @object_name, @method_name = object_name, method_name
         @template_object, @local_binding = template_object, local_binding
+        if @object_name.sub!(/\[\]$/,"")
+          @auto_index = @template_object.instance_variable_get("@#{Regexp.last_match.pre_match}").id
+        end
       end
       
       def to_input_field_tag(field_type, options = {})
@@ -214,6 +217,9 @@ module ActionView
             options['name'] = tag_name_with_index(options["index"]) unless options.has_key? "name"
             options['id'] = tag_id_with_index(options["index"]) unless options.has_key? "id"
             options.delete("index")
+          elsif @auto_index
+            options['name'] = tag_name_with_index(@auto_index) unless options.has_key? "name"
+            options['id'] = tag_id_with_index(@auto_index) unless options.has_key? "id"
           else
             options['name'] = tag_name unless options.has_key? "name"
             options['id'] = tag_id unless options.has_key? "id"
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index c6128a9337..6b1deb575e 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -18,6 +18,8 @@ class FormHelperTest < Test::Unit::TestCase
     @post = Post.new    
     def @post.errors() Class.new{ def on(field) field == "author_name" end }.new end
 
+    def @post.id; 123; end
+
     @post.title       = "Hello World"
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
@@ -136,4 +138,28 @@ class FormHelperTest < Test::Unit::TestCase
       check_box("post", "secret", "id" => "i mean it")
     )
   end
+
+  def test_auto_index
+    pid = @post.id
+    assert_equal(
+      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
+    )
+    assert_equal(
+      "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\" wrap=\"virtual\">Back to the hill and over it again!</textarea>",
+      text_area("post[]", "body")
+    )
+    assert_equal(
+      "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
+      check_box("post[]", "secret")
+    )
+   assert_equal(
+"<input checked=\"checked\" id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"radio\" value=\"Hello World\" />",
+      radio_button("post[]", "title", "Hello World")
+    )
+    assert_equal("<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"radio\" value=\"Goodbye World\" />",
+      radio_button("post[]", "title", "Goodbye World")
+    )
+
+  end
+
 end