Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d3ec4b1b
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,发现更多精彩内容 >>
提交
d3ec4b1b
编写于
4月 10, 2010
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Use path_names, not resource_path_names, consistently"
Breaks tests on Ruby 1.8.7. This reverts commit
13bbf98d
.
上级
13bbf98d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
6 deletion
+6
-6
actionpack/lib/action_dispatch/routing/mapper.rb
actionpack/lib/action_dispatch/routing/mapper.rb
+6
-6
未找到文件。
actionpack/lib/action_dispatch/routing/mapper.rb
浏览文件 @
d3ec4b1b
...
...
@@ -372,7 +372,7 @@ def merge_controller_scope(parent, child)
@scope
[
:module
]
?
"
#{
@scope
[
:module
]
}
/
#{
child
}
"
:
child
end
def
merge_path_names_scope
(
parent
,
child
)
def
merge_
resources_
path_names_scope
(
parent
,
child
)
merge_options_scope
(
parent
,
child
)
end
...
...
@@ -521,7 +521,7 @@ def member_name
def
initialize
(
*
args
)
#:nodoc:
super
@scope
[
:path_names
]
=
@set
.
resources_path_names
@scope
[
:
resources_
path_names
]
=
@set
.
resources_path_names
end
def
resource
(
*
resources
,
&
block
)
...
...
@@ -637,7 +637,7 @@ def match(*args)
return
self
end
path_names
=
options
.
delete
(
:path_names
)
resources_
path_names
=
options
.
delete
(
:path_names
)
if
args
.
first
.
is_a?
(
Symbol
)
action
=
args
.
first
...
...
@@ -654,7 +654,7 @@ def match(*args)
end
else
with_exclusive_name_prefix
(
action
)
do
return
match
(
"
#{
action_path
(
action
,
path_names
)
}
(.:format)"
,
options
.
reverse_merge
(
:to
=>
action
))
return
match
(
"
#{
action_path
(
action
,
resources_
path_names
)
}
(.:format)"
,
options
.
reverse_merge
(
:to
=>
action
))
end
end
end
...
...
@@ -682,7 +682,7 @@ def parent_resource #:nodoc:
private
def
action_path
(
name
,
path_names
=
nil
)
path_names
||=
@scope
[
:
path_name
]
path_names
||=
@scope
[
:
resources_path_names
]
path_names
[
name
.
to_sym
]
||
name
.
to_s
end
...
...
@@ -693,7 +693,7 @@ def apply_common_behavior_for(method, resources, options, &block)
end
if
path_names
=
options
.
delete
(
:path_names
)
scope
(
:path_names
=>
path_names
)
do
scope
(
:
resources_
path_names
=>
path_names
)
do
send
(
method
,
resources
.
pop
,
options
,
&
block
)
end
return
true
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录