diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 15:21:35 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-08 14:34:51 -0200 |
| commit | 2a6f208ee15479fb1b9beabccf548a9ffb27d589 (patch) | |
| tree | 3a8a8c80077bde4e40ab314b352b81ff805c4fa2 /actionpack/lib/action_view | |
| parent | b02556708cd0c3de3d56bd94c624ade44cbce14a (diff) | |
| download | rails-2a6f208ee15479fb1b9beabccf548a9ffb27d589.tar.gz rails-2a6f208ee15479fb1b9beabccf548a9ffb27d589.tar.bz2 rails-2a6f208ee15479fb1b9beabccf548a9ffb27d589.zip | |
Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag
Support :multiple option on input tags that also have :index
Conflicts:
actionpack/lib/action_view/helpers/tags/base.rb
actionpack/lib/action_view/helpers/tags/collection_check_boxes.rb
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index a3409ee3c7..d00bad7608 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1205,9 +1205,11 @@ module ActionView options["name"] ||= tag_name_with_index(@auto_index) options["id"] = options.fetch("id"){ tag_id_with_index(@auto_index) } else - options["name"] ||= tag_name + (options['multiple'] ? '[]' : '') + options["name"] ||= tag_name options["id"] = options.fetch("id"){ tag_id } end + + options["name"] += "[]" if options["multiple"] options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence end |