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

Generate field ids in collection_check_boxes and collection_radio_buttons

Browse source 
This makes sure that the labels are linked up with the fields.
Fixes #29014
This commit is contained in:
yuuji.yaginuma 2017-06-11 16:21:32 +09:00
parent ddea316425
commit bc90514228
4 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
actionview/CHANGELOG.md
View file

@ -1,3 +1,11 @@
* Generate field ids in `collection_check_boxes` and `collection_radio_buttons`.
This makes sure that the labels are linked up with the fields.
Fixes #29014.
*Yuji Yaginuma*
* Add `:json` type to `auto_discovery_link_tag` to support [JSON Feeds](https://jsonfeed.org/version/1) * Add `:json` type to `auto_discovery_link_tag` to support [JSON Feeds](https://jsonfeed.org/version/1)
*Mike Gunderloy* *Mike Gunderloy*

1
actionview/lib/action_view/helpers/tags/collection_check_boxes.rb
View file

@ -10,6 +10,7 @@ module ActionView
def check_box(extra_html_options = {}) def check_box(extra_html_options = {})
html_options = extra_html_options.merge(@input_html_options) html_options = extra_html_options.merge(@input_html_options)
html_options[:multiple] = true html_options[:multiple] = true
html_options[:skip_default_ids] = false
@template_object.check_box(@object_name, @method_name, html_options, @value, nil) @template_object.check_box(@object_name, @method_name, html_options, @value, nil)
end end
end end

1
actionview/lib/action_view/helpers/tags/collection_radio_buttons.rb
View file

@ -9,6 +9,7 @@ module ActionView
class RadioButtonBuilder < Builder # :nodoc: class RadioButtonBuilder < Builder # :nodoc:
def radio_button(extra_html_options = {}) def radio_button(extra_html_options = {})
html_options = extra_html_options.merge(@input_html_options) html_options = extra_html_options.merge(@input_html_options)
html_options[:skip_default_ids] = false
@template_object.radio_button(@object_name, @method_name, @value, html_options) @template_object.radio_button(@object_name, @method_name, @value, html_options)
end end
end end

36
actionview/test/template/form_helper/form_with_test.rb
View file

@ -403,9 +403,9 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input type='hidden' name='post[active]' value='' />" \ "<input type='hidden' name='post[active]' value='' />" \
"<input name='post[active]' type='radio' value='true' />" \ "<input name='post[active]' type='radio' value='true' id='post_active_true' />" \
"<label for='post_active_true'>true</label>" \ "<label for='post_active_true'>true</label>" \
"<input checked='checked' name='post[active]' type='radio' value='false' />" \ "<input checked='checked' name='post[active]' type='radio' value='false' id='post_active_false' />" \
"<label for='post_active_false'>false</label>" "<label for='post_active_false'>false</label>"
end end
@ -426,10 +426,10 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input type='hidden' name='post[active]' value='' />" \ "<input type='hidden' name='post[active]' value='' />" \
"<label for='post_active_true'>" \ "<label for='post_active_true'>" \
"<input name='post[active]' type='radio' value='true' />" \ "<input name='post[active]' type='radio' value='true' id='post_active_true' />" \
"true</label>" \ "true</label>" \
"<label for='post_active_false'>" \ "<label for='post_active_false'>" \
"<input checked='checked' name='post[active]' type='radio' value='false' />" \ "<input checked='checked' name='post[active]' type='radio' value='false' id='post_active_false' />" \
"false</label>" "false</label>"
end end
@ -452,10 +452,10 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input type='hidden' name='post[active]' value='' />" \ "<input type='hidden' name='post[active]' value='' />" \
"<label for='post_active_true'>" \ "<label for='post_active_true'>" \
"<input name='post[active]' type='radio' value='true' />" \ "<input name='post[active]' type='radio' value='true' id='post_active_true' />" \
"true</label>" \ "true</label>" \
"<label for='post_active_false'>" \ "<label for='post_active_false'>" \
"<input checked='checked' name='post[active]' type='radio' value='false' />" \ "<input checked='checked' name='post[active]' type='radio' value='false' id='post_active_false' />" \
"false</label>" \ "false</label>" \
"<input name='post[id]' type='hidden' value='1' />" "<input name='post[id]' type='hidden' value='1' />"
end end
@ -473,9 +473,9 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input type='hidden' name='post[1][active]' value='' />" \ "<input type='hidden' name='post[1][active]' value='' />" \
"<input name='post[1][active]' type='radio' value='true' />" \ "<input name='post[1][active]' type='radio' value='true' id='post_1_active_true' />" \
"<label for='post_1_active_true'>true</label>" \ "<label for='post_1_active_true'>true</label>" \
"<input checked='checked' name='post[1][active]' type='radio' value='false' />" \ "<input checked='checked' name='post[1][active]' type='radio' value='false' id='post_1_active_false' />" \
"<label for='post_1_active_false'>false</label>" "<label for='post_1_active_false'>false</label>"
end end
@ -492,11 +492,11 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input name='post[tag_ids][]' type='hidden' value='' />" \ "<input name='post[tag_ids][]' type='hidden' value='' />" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' id='post_tag_ids_1' />" \
"<label for='post_tag_ids_1'>Tag 1</label>" \ "<label for='post_tag_ids_1'>Tag 1</label>" \
"<input name='post[tag_ids][]' type='checkbox' value='2' />" \ "<input name='post[tag_ids][]' type='checkbox' value='2' id='post_tag_ids_2' />" \
"<label for='post_tag_ids_2'>Tag 2</label>" \ "<label for='post_tag_ids_2'>Tag 2</label>" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' id='post_tag_ids_3' />" \
"<label for='post_tag_ids_3'>Tag 3</label>" "<label for='post_tag_ids_3'>Tag 3</label>"
end end
@ -517,13 +517,13 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input name='post[tag_ids][]' type='hidden' value='' />" \ "<input name='post[tag_ids][]' type='hidden' value='' />" \
"<label for='post_tag_ids_1'>" \ "<label for='post_tag_ids_1'>" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' id='post_tag_ids_1' />" \
"Tag 1</label>" \ "Tag 1</label>" \
"<label for='post_tag_ids_2'>" \ "<label for='post_tag_ids_2'>" \
"<input name='post[tag_ids][]' type='checkbox' value='2' />" \ "<input name='post[tag_ids][]' type='checkbox' value='2' id='post_tag_ids_2' />" \
"Tag 2</label>" \ "Tag 2</label>" \
"<label for='post_tag_ids_3'>" \ "<label for='post_tag_ids_3'>" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' id='post_tag_ids_3' />" \
"Tag 3</label>" "Tag 3</label>"
end end
@ -547,13 +547,13 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input name='post[tag_ids][]' type='hidden' value='' />" \ "<input name='post[tag_ids][]' type='hidden' value='' />" \
"<label for='post_tag_ids_1'>" \ "<label for='post_tag_ids_1'>" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='1' id='post_tag_ids_1' />" \
"Tag 1</label>" \ "Tag 1</label>" \
"<label for='post_tag_ids_2'>" \ "<label for='post_tag_ids_2'>" \
"<input name='post[tag_ids][]' type='checkbox' value='2' />" \ "<input name='post[tag_ids][]' type='checkbox' value='2' id='post_tag_ids_2' />" \
"Tag 2</label>" \ "Tag 2</label>" \
"<label for='post_tag_ids_3'>" \ "<label for='post_tag_ids_3'>" \
"<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' />" \ "<input checked='checked' name='post[tag_ids][]' type='checkbox' value='3' id='post_tag_ids_3' />" \
"Tag 3</label>" \ "Tag 3</label>" \
"<input name='post[id]' type='hidden' value='1' />" "<input name='post[id]' type='hidden' value='1' />"
end end
@ -572,7 +572,7 @@ class FormWithActsLikeFormForTest < FormWithTest
expected = whole_form("/posts") do expected = whole_form("/posts") do
"<input name='post[1][tag_ids][]' type='hidden' value='' />" \ "<input name='post[1][tag_ids][]' type='hidden' value='' />" \
"<input checked='checked' name='post[1][tag_ids][]' type='checkbox' value='1' />" \ "<input checked='checked' name='post[1][tag_ids][]' type='checkbox' value='1' id='post_1_tag_ids_1' />" \
"<label for='post_1_tag_ids_1'>Tag 1</label>" "<label for='post_1_tag_ids_1'>Tag 1</label>"
end end