kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #8340 from skojin/grouped_options_for_select_without_hash_sort

Browse source 
No sort Hash options in #grouped_options_for_select
This commit is contained in:
Rafael Mendonça França 2012-11-27 08:20:30 -08:00
commit ac8c729342
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG.md
View file

@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
* No sort Hash options in #grouped_options_for_select. *Sergey Kojin*
* Accept symbols as #send_data :disposition value *Elia Schito*
* Add i18n scope to distance_of_time_in_words. *Steve Klabnik*

10
actionpack/lib/action_view/helpers/form_options_helper.rb
View file

@ -482,15 +482,15 @@ module ActionView
# grouped_options_for_select(grouped_options)
#
# Possible output:
# <optgroup label="North America">
# <option value="US">United States</option>
# <option value="Canada">Canada</option>
# </optgroup>
# <optgroup label="Europe">
# <option value="Denmark">Denmark</option>
# <option value="Germany">Germany</option>
# <option value="France">France</option>
# </optgroup>
# <optgroup label="North America">
# <option value="US">United States</option>
# <option value="Canada">Canada</option>
# </optgroup>
#
# Sample usage (divider):
# grouped_options = [
@ -530,8 +530,6 @@ module ActionView
body.safe_concat content_tag(:option, prompt_text(prompt), :value => "")
end
grouped_options = grouped_options.sort if grouped_options.is_a?(Hash)
grouped_options.each do |container|
if divider
label = divider

2
actionpack/test/template/form_options_helper_test.rb
View file

@ -346,7 +346,7 @@ class FormOptionsHelperTest < ActionView::TestCase
def test_optgroups_with_with_options_with_hash
assert_dom_equal(
"<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
"<optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup>",
grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
)
end