Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
1847d33b
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,发现更多精彩内容 >>
提交
1847d33b
编写于
8月 24, 2010
作者:
A
Andrew White
提交者:
José Valim
8月 24, 2010
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use nested scope for routes defined at the :resources scope level (as in Rails 2.3)
Signed-off-by:
N
José Valim
<
jose.valim@gmail.com
>
上级
3ac6646d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
5 deletion
+13
-5
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+6
-5
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+7
-0
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
1847d33b
...
...
@@ -695,15 +695,14 @@ def match(*args)
raise
ArgumentError
,
"Unknown scope
#{
on
.
inspect
}
given to :on"
end
if
@scope
[
:scope_level
]
==
:resource
if
@scope
[
:scope_level
]
==
:resources
args
.
push
(
options
)
return
nested
{
match
(
*
args
)
}
elsif
@scope
[
:scope_level
]
==
:resource
args
.
push
(
options
)
return
member
{
match
(
*
args
)
}
end
if
resource_scope?
raise
ArgumentError
,
"can't define route directly in resource(s) scope"
end
action
=
args
.
first
path
=
path_for_action
(
action
,
options
.
delete
(
:path
))
...
...
@@ -900,6 +899,8 @@ def name_for_action(action, as=nil)
end
name
=
case
@scope
[
:scope_level
]
when
:nested
[
member_name
,
prefix
]
when
:collection
[
prefix
,
name_prefix
,
collection_name
]
when
:new
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
1847d33b
...
...
@@ -231,6 +231,7 @@ def self.matches?(request)
get
"inactive"
,
:on
=>
:collection
post
"deactivate"
,
:on
=>
:member
get
"old"
,
:on
=>
:collection
,
:as
=>
:stale
get
"export"
end
namespace
:api
do
...
...
@@ -2091,6 +2092,12 @@ def test_custom_resource_actions_defined_using_string
assert_equal
'/customers/1/invoices/aged/3'
,
aged_customer_invoices_path
(
:customer_id
=>
'1'
,
:months
=>
'3'
)
end
def
test_route_defined_in_resources_scope_level
get
'/customers/1/export'
assert_equal
'customers#export'
,
@response
.
body
assert_equal
'/customers/1/export'
,
customer_export_path
(
:customer_id
=>
'1'
)
end
private
def
with_test_routes
yield
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录