Permalink
Browse files

Only set `:include_blank` if the value of this options is not present

  • Loading branch information...
1 parent 94d84c5 commit 30818561158dce27f3b0ae3f659a7bfdc867b834 Rafael Mendonça França committed with rafaelfranca May 13, 2012
View
2 actionpack/lib/action_view/helpers/tags/base.rb
@@ -121,7 +121,7 @@ def sanitized_value(value)
def select_content_tag(option_tags, options, html_options)
html_options = html_options.stringify_keys
add_default_name_and_id(html_options)
- options[:include_blank] = true if option_required?(html_options)
+ options[:include_blank] ||= true if option_required?(html_options)
select = content_tag("select", add_options(option_tags, options, value(object)), html_options)
if html_options["multiple"] && options.fetch(:include_hidden, true)
View
6 actionpack/test/template/form_options_helper_test.rb
@@ -640,6 +640,12 @@ def test_required_select
select("post", "category", %w(abe mus hest), {}, required: true)
)
end
+
+ def test_required_select_with_include_blank_prompt
+ assert_dom_equal(
+ %(<select id="post_category" name="post[category]" required="required"><option value="">Select one</option>\n<option value="abe">abe</option>\n<option value="mus">mus</option>\n<option value="hest">hest</option></select>),
+ select("post", "category", %w(abe mus hest), { include_blank: "Select one" }, required: true)
+ )
end
def test_required_select_display_size_equals_to_one

0 comments on commit 3081856

Please sign in to comment.