diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-12-24 10:09:19 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-12-24 10:20:26 +0100 |
| commit | fefd76e82af28decb895c22bbe1bbf265a2a8b75 (patch) | |
| tree | a944140af0cfb93a843feae4a206f7920b5f737d | |
| parent | 7aa047b57237f691540afc3e22b91f73df7e5bc4 (diff) | |
| parent | 621ed494f573c4e37c1f7d37cc8741cc4c502827 (diff) | |
| download | rails-fefd76e82af28decb895c22bbe1bbf265a2a8b75.tar.gz rails-fefd76e82af28decb895c22bbe1bbf265a2a8b75.tar.bz2 rails-fefd76e82af28decb895c22bbe1bbf265a2a8b75.zip | |
Merge pull request #22778 from y-yagi/fix_submit_tag_with_symbol_value
fix TypeError when using submit_tag with Symbol value
| -rw-r--r-- | actionview/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/form_tag_helper.rb | 2 | ||||
| -rw-r--r-- | actionview/test/template/form_tag_helper_test.rb | 7 |
3 files changed, 13 insertions, 1 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index a43d9039db..85d91825ac 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,8 @@ +* Fix regression in `submit_tag` when a symbol is used as label argument. + + *Yuuji Yaginuma* + + ## Rails 5.0.0.beta1 (December 18, 2015) ## * `I18n.translate` helper will wrap the missing translation keys diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb index 0191064326..79a1a242bf 100644 --- a/actionview/lib/action_view/helpers/form_tag_helper.rb +++ b/actionview/lib/action_view/helpers/form_tag_helper.rb @@ -447,7 +447,7 @@ module ActionView unless tag_options["data-disable-with"] == false || (tag_options["data"] && tag_options["data"][:disable_with] == false) disable_with_text = tag_options["data-disable-with"] disable_with_text ||= tag_options["data"][:disable_with] if tag_options["data"] - disable_with_text ||= value.clone + disable_with_text ||= value.to_s.clone tag_options.deep_merge!("data" => { "disable_with" => disable_with_text }) else tag_options["data"].delete(:disable_with) if tag_options["data"] diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb index de1eb89dc5..359ecbc637 100644 --- a/actionview/test/template/form_tag_helper_test.rb +++ b/actionview/test/template/form_tag_helper_test.rb @@ -510,6 +510,13 @@ class FormTagHelperTest < ActionView::TestCase ) end + def test_submit_tag_with_symbol_value + assert_dom_equal( + %(<input data-disable-with="Save" name='commit' type="submit" value="Save" />), + submit_tag(:Save) + ) + end + def test_button_tag assert_dom_equal( |