Merge pull request #5420 from lest/patch-2

add include_hidden option to checkbox tag

2 files changed, 13 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/helpers/tags/check_box.rb b/actionpack/lib/action_view/helpers/tags/check_box.rb
index 579cdb9fc9..1a4aebb936 100644
--- a/actionpack/lib/action_view/helpers/tags/check_box.rb
+++ b/actionpack/lib/action_view/helpers/tags/check_box.rb
@@ -25,9 +25,15 @@ module ActionView
             add_default_name_and_id(options)
           end
 
-          hidden   = hidden_field_for_checkbox(options)
+          include_hidden = options.delete("include_hidden") { true }
           checkbox = tag("input", options)
-          hidden + checkbox
+
+          if include_hidden
+            hidden = hidden_field_for_checkbox(options)
+            hidden + checkbox
+          else
+            checkbox
+          end
         end
 
         private
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index bc42e14b8a..2bdb54bd5e 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -387,6 +387,11 @@ class FormHelperTest < ActionView::TestCase
     )
   end
 
+  def test_check_box_with_include_hidden_false
+    @post.secret = false
+    assert_dom_equal('<input id="post_secret" name="post[secret]" type="checkbox" value="1" />', check_box("post", "secret", :include_hidden => false))
+  end
+
   def test_check_box_with_explicit_checked_and_unchecked_values
     @post.secret = "on"
     assert_dom_equal(