diff options
author | José Valim <jose.valim@gmail.com> | 2011-07-01 04:31:48 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-07-01 04:31:48 -0700 |
commit | b31ce90e99ca73ebbe529d9fef9d6ead3e2364a9 (patch) | |
tree | 26fc840443134cd070f7328652d6c82174130f17 /actionpack | |
parent | cb99c8593a8d5a92378a8167486d5148c1e2dff5 (diff) | |
parent | 0fdac01876c37c692e9107b6120e03aec692663d (diff) | |
download | rails-b31ce90e99ca73ebbe529d9fef9d6ead3e2364a9.tar.gz rails-b31ce90e99ca73ebbe529d9fef9d6ead3e2364a9.tar.bz2 rails-b31ce90e99ca73ebbe529d9fef9d6ead3e2364a9.zip |
Merge pull request #1927 from bogdan/select_multiple_index
Fixed ActionView::FormOptionsHelper#select with :multiple => false
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_view/helpers/form_helper.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/form_options_helper_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb index 0ef2357368..41a503982a 100644 --- a/actionpack/lib/action_view/helpers/form_helper.rb +++ b/actionpack/lib/action_view/helpers/form_helper.rb @@ -1153,7 +1153,7 @@ 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.has_key?('multiple') ? '[]' : '') + options["name"] ||= tag_name + (options['multiple'] ? '[]' : '') options["id"] = options.fetch("id"){ tag_id } end end diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index f3969895ae..a4599a3f00 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -378,6 +378,13 @@ class FormOptionsHelperTest < ActionView::TestCase ) end + def test_select_without_multiple + assert_dom_equal( + "<select id=\"post_category\" name=\"post[category]\"></select>", + select(:post, :category, "", {}, :multiple => false) + ) + end + def test_select_with_boolean_method @post = Post.new @post.allow_comments = false |