Allow collection radio_buttons/check_boxes to access current text/value

[Carlos Antonio da Silva + Rafael Mendonça França]

2 files changed, 16 insertions, 0 deletions

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index f3e8de9ce1..c5a738d99f 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -573,6 +573,13 @@ module ActionView
       #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
       #     b.label(:class => "radio_button") { b.radio_button(:class => "radio_button") }
       #   end
+      #
+      # There are also two special methods available: <tt>text</tt> and
+      # <tt>value</tt>, which are the current text and value methods for the
+      # item being rendered, respectively. You can use them like this:
+      #   collection_radio_buttons(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
+      #      b.label(:"data-value" => b.value) { b.radio_button + b.text }
+      #   end
       def collection_radio_buttons(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
         Tags::CollectionRadioButtons.new(object, method, self, collection, value_method, text_method, options, html_options).render(&block)
       end
@@ -629,6 +636,13 @@ module ActionView
       #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
       #     b.label(:class => "check_box") { b.check_box(:class => "check_box") }
       #   end
+      #
+      # There are also two special methods available: <tt>text</tt> and
+      # <tt>value</tt>, which are the current text and value methods for the
+      # item being rendered, respectively. You can use them like this:
+      #   collection_check_boxes(:post, :author_ids, Author.all, :id, :name_with_initial) do |b|
+      #      b.label(:"data-value" => b.value) { b.check_box + b.text }
+      #   end
       def collection_check_boxes(object, method, collection, value_method, text_method, options = {}, html_options = {}, &block)
         Tags::CollectionCheckBoxes.new(object, method, self, collection, value_method, text_method, options, html_options).render(&block)
       end
diff --git a/actionpack/lib/action_view/helpers/tags/collection_helpers.rb b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
index c5fa7e1458..1e2e77dde1 100644
--- a/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
+++ b/actionpack/lib/action_view/helpers/tags/collection_helpers.rb
@@ -3,6 +3,8 @@ module ActionView
     module Tags
       module CollectionHelpers
         class Builder
+          attr_reader :text, :value
+
           def initialize(template_object, object_name, method_name,
                          sanitized_attribute_name, text, value, input_html_options)
             @template_object = template_object