aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorVasiliy Ermolovich <younash@gmail.com>2013-04-11 14:15:33 +0300
committerVasiliy Ermolovich <younash@gmail.com>2013-04-11 14:15:33 +0300
commit0778290b57433da3bcd707fce222b8f646b7de4f (patch)
treebd3589ac814dd90a9d98b67eb74e138cc1898354 /actionpack/lib
parent2a07db716957bf1638a84aa3c1f69d26efdbdb7d (diff)
downloadrails-0778290b57433da3bcd707fce222b8f646b7de4f.tar.gz
rails-0778290b57433da3bcd707fce222b8f646b7de4f.tar.bz2
rails-0778290b57433da3bcd707fce222b8f646b7de4f.zip
options_from_collection_for_select helper takes html attributes
as the last element of the array
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_options_helper.rb2
1 files changed, 1 insertions, 1 deletions
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 = {