diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-24 15:35:30 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-24 15:35:30 +0000 |
commit | b69d33752703b36c1b8b5ccf043fd80a5d323d82 (patch) | |
tree | 27140d89672f195c3c35bed5a7e64fbc421b7c06 /actionpack/lib/action_view/helpers/form_helper.rb | |
parent | d071deeecd9e176b09720aa9e9ca79bb9a8319fd (diff) | |
download | rails-b69d33752703b36c1b8b5ccf043fd80a5d323d82.tar.gz rails-b69d33752703b36c1b8b5ccf043fd80a5d323d82.tar.bz2 rails-b69d33752703b36c1b8b5ccf043fd80a5d323d82.zip |
Applied the dblack patch
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/form_helper.rb')
-rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 6 |
1 files changed, 6 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" |