Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
075f50d6
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,发现更多精彩内容 >>
提交
075f50d6
编写于
11月 29, 2009
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some nested resource generation tests
上级
f69f9820
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
11 deletion
+12
-11
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+10
-5
actionpack/test/dispatch/routing_test.rb
actionpack/test/dispatch/routing_test.rb
+2
-6
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
075f50d6
...
...
@@ -80,15 +80,19 @@ def resource(*resources, &block)
resource
=
SingletonResource
.
new
(
resources
.
pop
,
:name_prefix
=>
name_prefix
)
if
@scope
[
:scope_level
]
==
:resources
member
do
resource
(
resource
.
name
,
options
,
&
block
)
parent_resource
=
@scope
[
:scope_level_options
][
:name
]
parent_named_prefix
=
@scope
[
:scope_level_options
][
:name_prefix
]
with_scope_level
(
:member
)
do
scope
(
":
#{
parent_resource
}
_id"
,
:name_prefix
=>
parent_named_prefix
)
do
resource
(
resource
.
name
,
options
,
&
block
)
end
end
return
self
end
controller
(
resource
.
controller
)
do
namespace
(
resource
.
name
)
do
with_scope_level
(
:resource
,
:name
=>
resource
.
singular
)
do
with_scope_level
(
:resource
,
:name
=>
resource
.
singular
,
:name_prefix
=>
resource
.
member_name
)
do
yield
if
block_given?
get
""
,
:to
=>
:show
,
:as
=>
resource
.
member_name
...
...
@@ -118,8 +122,9 @@ def resources(*resources, &block)
if
@scope
[
:scope_level
]
==
:resources
parent_resource
=
@scope
[
:scope_level_options
][
:name
]
parent_named_prefix
=
@scope
[
:scope_level_options
][
:name_prefix
]
with_scope_level
(
:member
)
do
scope
(
":
#{
parent_resource
}
_id"
,
:name_prefix
=>
parent_
resource
)
do
scope
(
":
#{
parent_resource
}
_id"
,
:name_prefix
=>
parent_
named_prefix
)
do
resources
(
resource
.
name
,
options
,
&
block
)
end
end
...
...
@@ -128,7 +133,7 @@ def resources(*resources, &block)
controller
(
resource
.
controller
)
do
namespace
(
resource
.
name
)
do
with_scope_level
(
:resources
,
:name
=>
resource
.
singular
)
do
with_scope_level
(
:resources
,
:name
=>
resource
.
singular
,
:name_prefix
=>
resource
.
member_name
)
do
yield
if
block_given?
collection
do
...
...
actionpack/test/dispatch/routing_test.rb
浏览文件 @
075f50d6
...
...
@@ -251,9 +251,7 @@ def test_projects_companies
get
'/projects/1/companies/1/people'
assert_equal
'people#index'
,
@response
.
body
pending
do
assert_equal
'/projects/1/companies/1/people'
,
project_company_people_path
(
:project_id
=>
'1'
,
:company_id
=>
'1'
)
end
assert_equal
'/projects/1/companies/1/people'
,
project_company_people_path
(
:project_id
=>
'1'
,
:company_id
=>
'1'
)
get
'/projects/1/companies/1/avatar'
assert_equal
'avatars#show'
,
@response
.
body
...
...
@@ -345,9 +343,7 @@ def test_projects_posts
get
'/projects/1/posts/1/comments'
assert_equal
'comments#index'
,
@response
.
body
pending
do
assert_equal
'/projects/1/posts/1/comments'
,
project_post_comments_path
(
:project_id
=>
'1'
,
:post_id
=>
'1'
)
end
assert_equal
'/projects/1/posts/1/comments'
,
project_post_comments_path
(
:project_id
=>
'1'
,
:post_id
=>
'1'
)
post
'/projects/1/posts/1/comments/preview'
assert_equal
'comments#preview'
,
@response
.
body
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录