Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
440a5ebd
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,发现更多精彩内容 >>
提交
440a5ebd
编写于
7月 22, 2012
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7123 from nashby/data-in-options
don't escape options in option_html_attributes method
上级
1b2a7bad
dacbcbe5
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
15 addition
and
8 deletion
+15
-8
actionpack/lib/action_view/helpers/form_options_helper.rb
actionpack/lib/action_view/helpers/form_options_helper.rb
+1
-1
actionpack/test/template/form_options_helper_test.rb
actionpack/test/template/form_options_helper_test.rb
+14
-7
未找到文件。
actionpack/lib/action_view/helpers/form_options_helper.rb
浏览文件 @
440a5ebd
...
...
@@ -711,7 +711,7 @@ def collection_check_boxes(object, method, collection, value_method, text_method
def
option_html_attributes
(
element
)
return
{}
unless
Array
===
element
Hash
[
element
.
select
{
|
e
|
Hash
===
e
}.
reduce
({},
:merge
).
map
{
|
k
,
v
|
[
k
,
ERB
::
Util
.
html_escape
(
v
.
to_s
)
]
}]
Hash
[
element
.
select
{
|
e
|
Hash
===
e
}.
reduce
({},
:merge
).
map
{
|
k
,
v
|
[
k
,
v
]
}]
end
def
option_text_and_value
(
option
)
...
...
actionpack/test/template/form_options_helper_test.rb
浏览文件 @
440a5ebd
...
...
@@ -1130,6 +1130,13 @@ def test_options_for_select_with_element_attributes
)
end
def
test_options_for_select_with_data_element
assert_dom_equal
(
"<option value=
\"
<Denmark>
\"
data-test=
\"
bold
\"
><Denmark></option>"
,
options_for_select
([
[
"<Denmark>"
,
{
:data
=>
{
:test
=>
'bold'
}
}
]
])
)
end
def
test_options_for_select_with_element_attributes_and_selection
assert_dom_equal
(
"<option value=
\"
<Denmark>
\"
><Denmark></option>
\n
<option value=
\"
USA
\"
class=
\"
bold
\"
selected=
\"
selected
\"
>USA</option>
\n
<option value=
\"
Sweden
\"
>Sweden</option>"
,
...
...
@@ -1144,6 +1151,13 @@ def test_options_for_select_with_element_attributes_and_selection_array
)
end
def
test_options_for_select_with_special_characters
assert_dom_equal
(
"<option value=
\"
<Denmark>
\"
onclick=
\"
alert("<code>")
\"
><Denmark></option>"
,
options_for_select
([
[
"<Denmark>"
,
{
:onclick
=>
%(alert("<code>"))
}
]
])
)
end
def
test_option_html_attributes_from_without_hash
assert_equal
(
{},
...
...
@@ -1172,13 +1186,6 @@ def test_option_html_attributes_with_multiple_hashes
)
end
def
test_option_html_attributes_with_special_characters
assert_equal
(
{
:onclick
=>
"alert("<code>")"
},
option_html_attributes
([
'foo'
,
'bar'
,
{
:onclick
=>
%(alert("<code>"))
}
])
)
end
def
test_grouped_collection_select
@post
=
Post
.
new
@post
.
origin
=
'dk'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录