Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
af874cc5
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,发现更多精彩内容 >>
提交
af874cc5
编写于
6月 28, 2016
作者:
R
Rafael França
提交者:
GitHub
6月 28, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #25544 from piotrj/pj-issue-25488
Fix setting route's to in a scope
上级
893fc510
a0b1912f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
21 addition
and
1 deletion
+21
-1
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+9
-1
actionpack/test/dispatch/mapper_test.rb
actionpack/test/dispatch/mapper_test.rb
+12
-0
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
af874cc5
...
...
@@ -1062,6 +1062,10 @@ def merge_options_scope(parent, child) #:nodoc:
def
merge_shallow_scope
(
parent
,
child
)
#:nodoc:
child
?
true
:
false
end
def
merge_to_scope
(
parent
,
child
)
child
end
end
# Resource routing allows you to quickly declare all of the common routes
...
...
@@ -1582,6 +1586,10 @@ def match(path, *rest)
raise
ArgumentError
,
"Unknown scope
#{
on
.
inspect
}
given to :on"
end
if
@scope
[
:to
]
options
[
:to
]
||=
@scope
[
:to
]
end
if
@scope
[
:controller
]
&&
@scope
[
:action
]
options
[
:to
]
||=
"
#{
@scope
[
:controller
]
}
#
#{
@scope
[
:action
]
}
"
end
...
...
@@ -2021,7 +2029,7 @@ def concerns(*args)
class
Scope
# :nodoc:
OPTIONS
=
[
:path
,
:shallow_path
,
:as
,
:shallow_prefix
,
:module
,
:controller
,
:action
,
:path_names
,
:constraints
,
:shallow
,
:blocks
,
:defaults
,
:via
,
:format
,
:options
]
:shallow
,
:blocks
,
:defaults
,
:via
,
:format
,
:options
,
:to
]
RESOURCE_SCOPES
=
[
:resource
,
:resources
]
RESOURCE_METHOD_SCOPES
=
[
:collection
,
:member
,
:new
]
...
...
actionpack/test/dispatch/mapper_test.rb
浏览文件 @
af874cc5
...
...
@@ -102,6 +102,18 @@ def test_via_scope
assert_equal
(
"PUT"
,
fakeset
.
routes
.
first
.
verb
)
end
def
test_to_scope
fakeset
=
FakeSet
.
new
mapper
=
Mapper
.
new
fakeset
mapper
.
scope
(
to:
"posts#index"
)
do
mapper
.
get
:all
mapper
.
post
:most
end
assert_equal
"posts#index"
,
fakeset
.
routes
.
to_a
[
0
].
defaults
[
:to
]
assert_equal
"posts#index"
,
fakeset
.
routes
.
to_a
[
1
].
defaults
[
:to
]
end
def
test_map_slash
fakeset
=
FakeSet
.
new
mapper
=
Mapper
.
new
fakeset
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录