Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7bdd5b76
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,发现更多精彩内容 >>
提交
7bdd5b76
编写于
8月 28, 2008
作者:
B
Brennan Dunn
提交者:
Jeremy Kemper
8月 28, 2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Accept an array of method symbols for collection/member actions of resources
Signed-off-by:
N
Jeremy Kemper
<
jeremy@bitsweat.net
>
上级
db22c895
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
8 deletion
+26
-8
actionpack/lib/action_controller/resources.rb
actionpack/lib/action_controller/resources.rb
+13
-8
actionpack/test/controller/resources_test.rb
actionpack/test/controller/resources_test.rb
+13
-0
未找到文件。
actionpack/lib/action_controller/resources.rb
浏览文件 @
7bdd5b76
...
@@ -238,8 +238,9 @@ def initialize(entity, options)
...
@@ -238,8 +238,9 @@ def initialize(entity, options)
#
#
# The +resources+ method accepts the following options to customize the resulting routes:
# The +resources+ method accepts the following options to customize the resulting routes:
# * <tt>:collection</tt> - Add named routes for other actions that operate on the collection.
# * <tt>:collection</tt> - Add named routes for other actions that operate on the collection.
# Takes a hash of <tt>#{action} => #{method}</tt>, where method is <tt>:get</tt>/<tt>:post</tt>/<tt>:put</tt>/<tt>:delete</tt>
# Takes a hash of <tt>#{action} => #{method}</tt>, where method is <tt>:get</tt>/<tt>:post</tt>/<tt>:put</tt>/<tt>:delete</tt>,
# or <tt>:any</tt> if the method does not matter. These routes map to a URL like /messages/rss, with a route of +rss_messages_url+.
# an array of any of the previous, or <tt>:any</tt> if the method does not matter.
# These routes map to a URL like /messages/rss, with a route of +rss_messages_url+.
# * <tt>:member</tt> - Same as <tt>:collection</tt>, but for actions that operate on a specific member.
# * <tt>:member</tt> - Same as <tt>:collection</tt>, but for actions that operate on a specific member.
# * <tt>:new</tt> - Same as <tt>:collection</tt>, but for actions that operate on the new resource action.
# * <tt>:new</tt> - Same as <tt>:collection</tt>, but for actions that operate on the new resource action.
# * <tt>:controller</tt> - Specify the controller name for the routes.
# * <tt>:controller</tt> - Specify the controller name for the routes.
...
@@ -480,11 +481,13 @@ def map_associations(resource, options)
...
@@ -480,11 +481,13 @@ def map_associations(resource, options)
def
map_collection_actions
(
map
,
resource
)
def
map_collection_actions
(
map
,
resource
)
resource
.
collection_methods
.
each
do
|
method
,
actions
|
resource
.
collection_methods
.
each
do
|
method
,
actions
|
actions
.
each
do
|
action
|
actions
.
each
do
|
action
|
action_options
=
action_options_for
(
action
,
resource
,
method
)
[
method
].
flatten
.
each
do
|
m
|
action_options
=
action_options_for
(
action
,
resource
,
m
)
map_named_routes
(
map
,
"
#{
action
}
_
#{
resource
.
name_prefix
}#{
resource
.
plural
}
"
,
"
#{
resource
.
path
}#{
resource
.
action_separator
}#{
action
}
"
,
action_options
)
map_named_routes
(
map
,
"
#{
action
}
_
#{
resource
.
name_prefix
}#{
resource
.
plural
}
"
,
"
#{
resource
.
path
}#{
resource
.
action_separator
}#{
action
}
"
,
action_options
)
end
end
end
end
end
end
end
def
map_default_collection_actions
(
map
,
resource
)
def
map_default_collection_actions
(
map
,
resource
)
index_action_options
=
action_options_for
(
"index"
,
resource
)
index_action_options
=
action_options_for
(
"index"
,
resource
)
...
@@ -521,7 +524,8 @@ def map_new_actions(map, resource)
...
@@ -521,7 +524,8 @@ def map_new_actions(map, resource)
def
map_member_actions
(
map
,
resource
)
def
map_member_actions
(
map
,
resource
)
resource
.
member_methods
.
each
do
|
method
,
actions
|
resource
.
member_methods
.
each
do
|
method
,
actions
|
actions
.
each
do
|
action
|
actions
.
each
do
|
action
|
action_options
=
action_options_for
(
action
,
resource
,
method
)
[
method
].
flatten
.
each
do
|
m
|
action_options
=
action_options_for
(
action
,
resource
,
m
)
action_path
=
resource
.
options
[
:path_names
][
action
]
if
resource
.
options
[
:path_names
].
is_a?
(
Hash
)
action_path
=
resource
.
options
[
:path_names
][
action
]
if
resource
.
options
[
:path_names
].
is_a?
(
Hash
)
action_path
||=
Base
.
resources_path_names
[
action
]
||
action
action_path
||=
Base
.
resources_path_names
[
action
]
||
action
...
@@ -529,6 +533,7 @@ def map_member_actions(map, resource)
...
@@ -529,6 +533,7 @@ def map_member_actions(map, resource)
map_named_routes
(
map
,
"
#{
action
}
_
#{
resource
.
name_prefix
}#{
resource
.
singular
}
"
,
"
#{
resource
.
member_path
}#{
resource
.
action_separator
}#{
action_path
}
"
,
action_options
)
map_named_routes
(
map
,
"
#{
action
}
_
#{
resource
.
name_prefix
}#{
resource
.
singular
}
"
,
"
#{
resource
.
member_path
}#{
resource
.
action_separator
}#{
action_path
}
"
,
action_options
)
end
end
end
end
end
show_action_options
=
action_options_for
(
"show"
,
resource
)
show_action_options
=
action_options_for
(
"show"
,
resource
)
map_named_routes
(
map
,
"
#{
resource
.
name_prefix
}#{
resource
.
singular
}
"
,
resource
.
member_path
,
show_action_options
)
map_named_routes
(
map
,
"
#{
resource
.
name_prefix
}#{
resource
.
singular
}
"
,
resource
.
member_path
,
show_action_options
)
...
...
actionpack/test/controller/resources_test.rb
浏览文件 @
7bdd5b76
...
@@ -264,6 +264,19 @@ def test_with_two_member_actions_with_same_method
...
@@ -264,6 +264,19 @@ def test_with_two_member_actions_with_same_method
end
end
end
end
def
test_array_as_collection_or_member_method_value
with_restful_routing
:messages
,
:collection
=>
{
:search
=>
[
:get
,
:post
]
},
:member
=>
{
:toggle
=>
[
:get
,
:post
]
}
do
assert_restful_routes_for
:messages
do
|
options
|
[
:get
,
:post
].
each
do
|
method
|
assert_recognizes
(
options
.
merge
(
:action
=>
'search'
),
:path
=>
"/messages/search"
,
:method
=>
method
)
end
[
:get
,
:post
].
each
do
|
method
|
assert_recognizes
(
options
.
merge
(
:action
=>
'toggle'
,
:id
=>
'1'
),
:path
=>
'/messages/1/toggle'
,
:method
=>
method
)
end
end
end
end
def
test_with_new_action
def
test_with_new_action
with_restful_routing
:messages
,
:new
=>
{
:preview
=>
:post
}
do
with_restful_routing
:messages
,
:new
=>
{
:preview
=>
:post
}
do
preview_options
=
{
:action
=>
'preview'
}
preview_options
=
{
:action
=>
'preview'
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录