Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
40c287c7
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,发现更多精彩内容 >>
提交
40c287c7
编写于
1月 31, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4802 from carlosantoniodasilva/collection-helpers-refactor
Refactor select helper and remove eval
上级
3bf859da
4af62c02
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
14 deletion
+28
-14
actionpack/lib/action_view/helpers/form_options_helper.rb
actionpack/lib/action_view/helpers/form_options_helper.rb
+3
-3
actionpack/lib/action_view/helpers/tags/collection_select.rb
actionpack/lib/action_view/helpers/tags/collection_select.rb
+7
-2
actionpack/lib/action_view/helpers/tags/select.rb
actionpack/lib/action_view/helpers/tags/select.rb
+18
-9
未找到文件。
actionpack/lib/action_view/helpers/form_options_helper.rb
浏览文件 @
40c287c7
...
...
@@ -334,7 +334,7 @@ def options_for_select(container, selected = nil)
end
.
join
(
"
\n
"
).
html_safe
end
# Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning
# Returns a string of option tags that have been compiled by iterating over the +collection+ and assigning
# the result of a call to the +value_method+ as the option value and the +text_method+ as the option text.
# Example:
# options_from_collection_for_select(@people, 'id', 'name')
...
...
@@ -418,9 +418,9 @@ def options_from_collection_for_select(collection, value_method, text_method, se
# wrap the output in an appropriate <tt><select></tt> tag.
def
option_groups_from_collection_for_select
(
collection
,
group_method
,
group_label_method
,
option_key_method
,
option_value_method
,
selected_key
=
nil
)
collection
.
map
do
|
group
|
group_label_string
=
eval
(
"group.
#{
group_label_method
}
"
)
group_label_string
=
group
.
send
(
group_label_method
)
"<optgroup label=
\"
#{
ERB
::
Util
.
html_escape
(
group_label_string
)
}
\"
>"
+
options_from_collection_for_select
(
eval
(
"group.
#{
group_method
}
"
),
option_key_method
,
option_value_method
,
selected_key
)
+
options_from_collection_for_select
(
group
.
send
(
group_method
),
option_key_method
,
option_value_method
,
selected_key
)
+
'</optgroup>'
end
.
join
.
html_safe
end
...
...
actionpack/lib/action_view/helpers/tags/collection_select.rb
浏览文件 @
40c287c7
...
...
@@ -12,9 +12,14 @@ def initialize(object_name, method_name, template_object, collection, value_meth
end
def
render
selected_value
=
@options
.
has_key?
(
:selected
)
?
@options
[
:selected
]
:
value
(
@object
)
option_tags_options
=
{
:selected
=>
@options
.
fetch
(
:selected
)
{
value
(
@object
)
},
:disabled
=>
@options
[
:disabled
]
}
select_content_tag
(
options_from_collection_for_select
(
@collection
,
@value_method
,
@text_method
,
:selected
=>
selected_value
,
:disabled
=>
@options
[
:disabled
]),
@options
,
@html_options
options_from_collection_for_select
(
@collection
,
@value_method
,
@text_method
,
option_tags_options
),
@options
,
@html_options
)
end
end
...
...
actionpack/lib/action_view/helpers/tags/select.rb
浏览文件 @
40c287c7
...
...
@@ -11,21 +11,30 @@ def initialize(object_name, method_name, template_object, choices, options, html
end
def
render
selected_value
=
@options
.
has_key?
(
:selected
)
?
@options
[
:selected
]
:
value
(
@object
)
option_tags_options
=
{
:selected
=>
@options
.
fetch
(
:selected
)
{
value
(
@object
)
},
:disabled
=>
@options
[
:disabled
]
}
# Grouped choices look like this:
#
# [nil, []]
# { nil => [] }
#
if
!
@choices
.
empty?
&&
@choices
.
first
.
respond_to?
(
:last
)
&&
Array
===
@choices
.
first
.
last
option_tags
=
grouped_options_for_select
(
@choices
,
:selected
=>
selected_value
,
:disabled
=>
@options
[
:disabled
])
option_tags
=
if
grouped_choices?
grouped_options_for_select
(
@choices
,
option_tags_options
)
else
option
_tags
=
options_for_select
(
@choices
,
:selected
=>
selected_value
,
:disabled
=>
@options
[
:disabled
]
)
option
s_for_select
(
@choices
,
option_tags_options
)
end
select_content_tag
(
option_tags
,
@options
,
@html_options
)
end
private
# Grouped choices look like this:
#
# [nil, []]
# { nil => [] }
#
def
grouped_choices?
!
@choices
.
empty?
&&
@choices
.
first
.
respond_to?
(
:last
)
&&
Array
===
@choices
.
first
.
last
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录