Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
64af96bb
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,发现更多精彩内容 >>
提交
64af96bb
编写于
5月 11, 2012
作者:
A
angelo giovanni capilleri
提交者:
Angelo Capilleri
5月 13, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Always include the options :include_blank if the select has a required attribute
and display size 1 and not multiple attribute, Fixes #5908
上级
beea9f5d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
0 deletion
+26
-0
actionpack/lib/action_view/helpers/tags/base.rb
actionpack/lib/action_view/helpers/tags/base.rb
+5
-0
actionpack/test/template/form_options_helper_test.rb
actionpack/test/template/form_options_helper_test.rb
+21
-0
未找到文件。
actionpack/lib/action_view/helpers/tags/base.rb
浏览文件 @
64af96bb
...
...
@@ -121,6 +121,7 @@ def sanitized_value(value)
def
select_content_tag
(
option_tags
,
options
,
html_options
)
html_options
=
html_options
.
stringify_keys
add_default_name_and_id
(
html_options
)
options
[
:include_blank
]
=
true
if
option_required?
(
html_options
)
select
=
content_tag
(
"select"
,
add_options
(
option_tags
,
options
,
value
(
object
)),
html_options
)
if
html_options
[
"multiple"
]
&&
options
.
fetch
(
:include_hidden
,
true
)
...
...
@@ -129,6 +130,10 @@ def select_content_tag(option_tags, options, html_options)
select
end
end
def
option_required?
(
html_options
)
html_options
[
"required"
]
&&
html_options
[
"size"
].
to_i
==
1
&&
!
html_options
[
"multiple"
]
end
def
add_options
(
option_tags
,
options
,
value
=
nil
)
if
options
[
:include_blank
]
...
...
actionpack/test/template/form_options_helper_test.rb
浏览文件 @
64af96bb
...
...
@@ -633,7 +633,28 @@ def test_select_with_nil
select
(
"post"
,
"category"
,
[
nil
,
"othervalue"
])
)
end
def
test_select_with_included_and_display_size_equals_to_one
assert_dom_equal
(
"<select id=
\"
post_category
\"
name=
\"
post[category]
\"
required=
\"
required
\"
size=
\"
1
\"
><option value=
\"\"
></option>
\n
<option value=
\"
abe
\"
>abe</option>
\n
<option value=
\"
mus
\"
>mus</option>
\n
<option value=
\"
hest
\"
>hest</option></select>"
,
select
(
"post"
,
"category"
,
%w( abe mus hest)
,{},
:required
=>
true
,
:size
=>
1
)
)
end
def
test_select_with_included_and_display_size_no_equals_to_one
assert_dom_equal
(
"<select id=
\"
post_category
\"
name=
\"
post[category]
\"
required=
\"
required
\"
size=
\"
2
\"
><option value=
\"
abe
\"
>abe</option>
\n
<option value=
\"
mus
\"
>mus</option>
\n
<option value=
\"
hest
\"
>hest</option></select>"
,
select
(
"post"
,
"category"
,
%w( abe mus hest)
,{},
:required
=>
true
,
:size
=>
2
)
)
end
def
test_select_with_included_and_multiple
assert_dom_equal
(
"<input name=
\"
post[category][]
\"
type=
\"
hidden
\"
value=
\"\"
/><select id=
\"
post_category
\"
multiple=
\"
multiple
\"
name=
\"
post[category][]
\"
required=
\"
required
\"
size=
\"
1
\"
><option value=
\"
abe
\"
>abe</option>
\n
<option value=
\"
mus
\"
>mus</option>
\n
<option value=
\"
hest
\"
>hest</option></select>"
,
select
(
"post"
,
"category"
,
%w( abe mus hest)
,
{},
:required
=>
true
,
:size
=>
1
,
:multiple
=>
true
)
)
end
def
test_select_with_fixnum
@post
=
Post
.
new
@post
.
category
=
""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录