Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make xyz_tag(..., :id => "foo") work again

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2535 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 8946804b8a73242ac59296782741fec2fb08e97a 1 parent 6fe5f65
@jamis jamis authored
View
14 actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -47,7 +47,7 @@ def end_form_tag
# Options:
# * <tt>:multiple</tt> - If set to true the selection will allow multiple choices.
def select_tag(name, option_tags = nil, options = {})
- content_tag("select", option_tags, { "name" => name, "id" => name }.update(options))
+ content_tag("select", option_tags, { "name" => name, "id" => name }.update(options.stringify_keys))
end
# Creates a standard text field.
@@ -59,7 +59,7 @@ def select_tag(name, option_tags = nil, options = {})
#
# A hash of standard HTML options for the tag.
def text_field_tag(name, value = nil, options = {})
- tag("input", { "type" => "text", "name" => name, "id" => name, "value" => value }.update(options))
+ tag("input", { "type" => "text", "name" => name, "id" => name, "value" => value }.update(options.stringify_keys))
end
# Creates a hidden field.
@@ -103,33 +103,33 @@ def text_area_tag(name, content = nil, options = {})
options.delete("size")
end
- content_tag("textarea", content, { "name" => name, "id" => name }.update(options))
+ content_tag("textarea", content, { "name" => name, "id" => name }.update(options.stringify_keys))
end
# Creates a check box.
def check_box_tag(name, value = "1", checked = false, options = {})
- html_options = { "type" => "checkbox", "name" => name, "id" => name, "value" => value }.update(options)
+ html_options = { "type" => "checkbox", "name" => name, "id" => name, "value" => value }.update(options.stringify_keys)
html_options["checked"] = "checked" if checked
tag("input", html_options)
end
# Creates a radio button.
def radio_button_tag(name, value, checked = false, options = {})
- html_options = { "type" => "radio", "name" => name, "id" => name, "value" => value }.update(options)
+ html_options = { "type" => "radio", "name" => name, "id" => name, "value" => value }.update(options.stringify_keys)
html_options["checked"] = "checked" if checked
tag("input", html_options)
end
# Creates a submit button with the text <tt>value</tt> as the caption.
def submit_tag(value = "Save changes", options = {})
- tag("input", { "type" => "submit", "name" => "commit", "value" => value }.update(options))
+ tag("input", { "type" => "submit", "name" => "commit", "value" => value }.update(options.stringify_keys))
end
# Displays an image which when clicked will submit the form.
#
# <tt>source</tt> is passed to AssetTagHelper#image_path
def image_submit_tag(source, options = {})
- tag("input", { "type" => "image", "src" => image_path(source) }.update(options))
+ tag("input", { "type" => "image", "src" => image_path(source) }.update(options.stringify_keys))
end
end
end
View
6 actionpack/test/template/form_tag_helper_test.rb
@@ -87,5 +87,11 @@ def test_boolean_optios
assert_dom_equal %(<select id="people" multiple="multiple" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => true)
assert_dom_equal %(<select id="people" name="people"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => nil)
end
+
+ def test_stringify_symbol_keys
+ actual = text_field_tag "title", "Hello!", :id => "admin"
+ expected = %(<input id="admin" name="title" type="text" value="Hello!" />)
+ assert_dom_equal expected, actual
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.