diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-16 14:02:14 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-16 14:02:14 -0700 |
| commit | 169273227184f3bc1fc85ba61f76cbedfcfb3338 (patch) | |
| tree | cb1db63eec79e993c4e863e113e30fda7dcd90a0 | |
| parent | ef7a48df7584b038c6e3e0f1dbca5749310ef9f6 (diff) | |
| parent | 0778290b57433da3bcd707fce222b8f646b7de4f (diff) | |
| download | rails-169273227184f3bc1fc85ba61f76cbedfcfb3338.tar.gz rails-169273227184f3bc1fc85ba61f76cbedfcfb3338.tar.bz2 rails-169273227184f3bc1fc85ba61f76cbedfcfb3338.zip | |
Merge pull request #10173 from nashby/element-attributes
options_from_collection_for_select helper takes html attributes
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/form_options_helper_test.rb | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 88cdd53336..06e05e4525 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,4 +1,9 @@ ## Rails 4.0.0 (unreleased) ## +* Element of the collection for `options_from_collection_for_select` helper can + optionally contain html attributes as the last element of the array as + `options_for_select` helper. + + *Vasiliy Ermolovich* * Fix explicit names on multiple file fields. If a file field tag has the multiple option, it is turned into an array field (appending `[]`), diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 7e65ebb4e4..719c9c09b5 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -380,7 +380,7 @@ module ActionView # should produce the desired results. def options_from_collection_for_select(collection, value_method, text_method, selected = nil) options = collection.map do |element| - [value_for_collection(element, text_method), value_for_collection(element, value_method)] + [value_for_collection(element, text_method), value_for_collection(element, value_method), option_html_attributes(element)] end selected, disabled = extract_selected_and_disabled(selected) select_deselect = { diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index 94ae8549f7..1715902927 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -100,6 +100,13 @@ class FormOptionsHelperTest < ActionView::TestCase ) end + def test_collection_options_with_element_attributes + assert_dom_equal( + "<option value=\"USA\" class=\"bold\">USA</option>", + options_from_collection_for_select([[ "USA", "USA", { :class => 'bold' } ]], :first, :second) + ) + end + def test_string_options_for_select options = "<option value=\"Denmark\">Denmark</option><option value=\"USA\">USA</option><option value=\"Sweden\">Sweden</option>" assert_dom_equal( |