Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
94c72c45
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
94c72c45
编写于
6月 28, 2013
作者:
K
kennyj
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove passing the prompt to grouped_options_for_select as an argument, because it was deprecated.
上级
4f1a7dc9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
26 deletion
+7
-26
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+5
-0
actionview/lib/action_view/helpers/form_options_helper.rb
actionview/lib/action_view/helpers/form_options_helper.rb
+2
-9
actionview/test/template/form_options_helper_test.rb
actionview/test/template/form_options_helper_test.rb
+0
-17
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
94c72c45
*
Remove passing the prompt to
`grouped_options_for_select`
as an argument, because
it was deprecated.
*kennyj*
*
Always escape the result of
`link_to_unless`
method.
Before:
...
...
actionview/lib/action_view/helpers/form_options_helper.rb
浏览文件 @
94c72c45
...
...
@@ -510,15 +510,8 @@ def option_groups_from_collection_for_select(collection, group_method, group_lab
# <b>Note:</b> Only the <tt><optgroup></tt> and <tt><option></tt> tags are returned, so you still have to
# wrap the output in an appropriate <tt><select></tt> tag.
def
grouped_options_for_select
(
grouped_options
,
selected_key
=
nil
,
options
=
{})
if
options
.
is_a?
(
Hash
)
prompt
=
options
[
:prompt
]
divider
=
options
[
:divider
]
else
prompt
=
options
message
=
"Passing the prompt to grouped_options_for_select as an argument is deprecated. "
\
"Please use an options hash like `{ prompt:
#{
prompt
.
inspect
}
}`."
ActiveSupport
::
Deprecation
.
warn
message
end
prompt
=
options
[
:prompt
]
divider
=
options
[
:divider
]
body
=
""
.
html_safe
...
...
actionview/test/template/form_options_helper_test.rb
浏览文件 @
94c72c45
...
...
@@ -310,15 +310,6 @@ def test_grouped_options_for_select_with_optional_divider
)
end
def
test_grouped_options_for_select_with_selected_and_prompt_deprecated
assert_deprecated
'Passing the prompt to grouped_options_for_select as an argument is deprecated. Please use an options hash like `{ prompt: "Choose a product..." }`.'
do
assert_dom_equal
(
"<option value=
\"\"
>Choose a product...</option><optgroup label=
\"
Hats
\"
><option value=
\"
Baseball Cap
\"
>Baseball Cap</option>
\n
<option selected=
\"
selected
\"
value=
\"
Cowboy Hat
\"
>Cowboy Hat</option></optgroup>"
,
grouped_options_for_select
([[
"Hats"
,
[
"Baseball Cap"
,
"Cowboy Hat"
]]],
"Cowboy Hat"
,
"Choose a product..."
)
)
end
end
def
test_grouped_options_for_select_with_selected_and_prompt
assert_dom_equal
(
"<option value=
\"\"
>Choose a product...</option><optgroup label=
\"
Hats
\"
><option value=
\"
Baseball Cap
\"
>Baseball Cap</option>
\n
<option selected=
\"
selected
\"
value=
\"
Cowboy Hat
\"
>Cowboy Hat</option></optgroup>"
,
...
...
@@ -337,14 +328,6 @@ def test_grouped_options_for_select_returns_html_safe_string
assert
grouped_options_for_select
([[
"Hats"
,
[
"Baseball Cap"
,
"Cowboy Hat"
]]]).
html_safe?
end
def
test_grouped_options_for_select_with_prompt_returns_html_escaped_string_deprecated
ActiveSupport
::
Deprecation
.
silence
do
assert_dom_equal
(
"<option value=
\"\"
><Choose One></option><optgroup label=
\"
Hats
\"
><option value=
\"
Baseball Cap
\"
>Baseball Cap</option>
\n
<option value=
\"
Cowboy Hat
\"
>Cowboy Hat</option></optgroup>"
,
grouped_options_for_select
([[
"Hats"
,
[
"Baseball Cap"
,
"Cowboy Hat"
]]],
nil
,
'<Choose One>'
))
end
end
def
test_grouped_options_for_select_with_prompt_returns_html_escaped_string
assert_dom_equal
(
"<option value=
\"\"
><Choose One></option><optgroup label=
\"
Hats
\"
><option value=
\"
Baseball Cap
\"
>Baseball Cap</option>
\n
<option value=
\"
Cowboy Hat
\"
>Cowboy Hat</option></optgroup>"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录