Set label's for: to id: option for checkbox and radio buttons. #472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattbrictson
reviewed
Jul 3, 2018
lib/bootstrap_form/form_builder.rb
Outdated
| checkbox_html | ||
| .concat(label(label_name, | ||
| label_description, | ||
| { class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {}))) |
There was a problem hiding this comment.
I wonder if it would be better to split out the label options into a separate variable instead of trying to do everything in one line? This is a bit hard to read.
lib/bootstrap_form/form_builder.rb
Outdated
| # TODO: Notice we don't seem to pass the ID into the custom control. | ||
| radio_html.concat(label(name, options[:label], value: value, class: label_class)) | ||
| radio_html | ||
| .concat(label(name, options[:label], { value: value, class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {}))) |
There was a problem hiding this comment.
Also here, e.g.
label_options = { value: value, class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {})
radio_html.concat(label(name, options[:label], label_options))or (even more explicit):
label_options = { value: value, class: label_class }
label_options[:for] = options[:id] if options[:id].present?
radio_html.concat(label(name, options[:label], label_options))| @@ -463,6 +463,17 @@ class BootstrapCheckboxTest < ActionView::TestCase | |||
| assert_equivalent_xml expected, @builder.check_box(:terms, {label: 'I agree to the terms', custom: true}) | |||
| end | |||
|
|
|||
| test "check_box is wrapped correctly with id option and custom option set" do | |||
mattbrictson
approved these changes
Jul 4, 2018
| @@ -49,6 +49,8 @@ In addition to these necessary markup changes, the bootstrap_form API itself has | |||
| * [#449](https://github.com/bootstrap-ruby/bootstrap_form/pull/449): Passing `.form-row` overrides default `.form-group.row` in horizontal layouts. | |||
| * Added an option to the `submit` (and `primary`, by transitivity) form tag helper, `render_as_button`, which when truthy makes the submit button render as a button instead of an input. This allows you to easily provide further styling to your form submission buttons, without requiring you to reinvent the wheel and use the `button` helper (and having to manually insert the typical Bootstrap classes). - [@jsaraiva](https://github.com/jsaraiva). | |||
| * Add `:error_message` option to `check_box` and `radio_button`, so they can output validation error messages if needed. [@lcreid](https://github.com/lcreid). | |||
| - [#472](https://github.com/bootstrap-ruby/bootstrap_form/pull/472) Use `id` option's value as `for` attribute of label for custom checkboxes and radio buttons. | |||
| * Your contribution here! | |||
There was a problem hiding this comment.
The entry should go in the Unreleased section, not the 4.0.0.alpha1 section. I'll change it before I merge.
There was a problem hiding this comment.
Doh! Thanks for moving it!
|
Merged into master @ 3032ba0. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If the programmer passes an
idoption to most helpers, our code sets theforattribute of the label to the value of theidoption. However, this was not happening for custom check boxes and radio buttons. I can think of no reason why we shouldn't do the same for custom check boxes and radio buttons, so this PR does so.Fixes #471.