mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix select_tag generating tag when set to false. 

Fixes https://github.com/rails/rails/issues/17701.
This commit is contained in:
Guo Xiang Tan 2014-11-21 17:44:24 +08:00
parent 8ffc8da713
commit e0e9d5bd86
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionview/lib/action_view/helpers/form_tag_helper.rb
View File

@ -140,7 +140,9 @@ module ActionView
include_blank = ''
end
option_tags = content_tag(:option, include_blank, value: '').safe_concat(option_tags)
if include_blank
option_tags = content_tag(:option, include_blank, value: '').safe_concat(option_tags)
end
end
if prompt = options.delete(:prompt)

6
actionview/test/template/form_tag_helper_test.rb
View File

@ -232,6 +232,12 @@ class FormTagHelperTest < ActionView::TestCase
assert_dom_equal expected, actual
end
def test_select_tag_with_include_blank_false
actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, include_blank: false
expected = %(<select id="places" name="places"><option>Home</option><option>Work</option><option>Pub</option></select>)
assert_dom_equal expected, actual
end
def test_select_tag_with_include_blank_string
actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, include_blank: 'Choose'
expected = %(<select id="places" name="places"><option value="">Choose</option><option>Home</option><option>Work</option><option>Pub</option></select>)