Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5b025a1d
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,发现更多精彩内容 >>
提交
5b025a1d
编写于
3月 13, 2009
作者:
J
Joshua Peek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert
5b7527ca
"Failing test for routes with member & requirement" [#2054 state:wontfix]
上级
eced3d8c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
1 addition
and
14 deletion
+1
-14
actionpack/lib/action_controller/resources.rb
actionpack/lib/action_controller/resources.rb
+1
-6
actionpack/test/controller/resources_test.rb
actionpack/test/controller/resources_test.rb
+0
-8
未找到文件。
actionpack/lib/action_controller/resources.rb
浏览文件 @
5b025a1d
...
...
@@ -670,12 +670,7 @@ def action_options_for(action, resource, method = nil)
when
"show"
,
"edit"
;
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
||
:get
)).
merge
(
resource
.
requirements
(
require_id
))
when
"update"
;
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
||
:put
)).
merge
(
resource
.
requirements
(
require_id
))
when
"destroy"
;
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
||
:delete
)).
merge
(
resource
.
requirements
(
require_id
))
else
if
method
.
nil?
||
resource
.
member_methods
.
nil?
||
resource
.
member_methods
[
method
.
to_sym
].
nil?
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
)).
merge
(
resource
.
requirements
)
else
resource
.
member_methods
[
method
.
to_sym
].
include?
(
action
)
?
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
)).
merge
(
resource
.
requirements
(
require_id
))
:
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
)).
merge
(
resource
.
requirements
)
end
else
default_options
.
merge
(
add_conditions_for
(
resource
.
conditions
,
method
)).
merge
(
resource
.
requirements
)
end
end
end
...
...
actionpack/test/controller/resources_test.rb
浏览文件 @
5b025a1d
...
...
@@ -209,14 +209,6 @@ def test_with_member_action
end
end
def
test_with_member_action_and_requirement
expected_options
=
{
:controller
=>
'messages'
,
:action
=>
'mark'
,
:id
=>
'1.1.1'
}
with_restful_routing
(
:messages
,
:requirements
=>
{
:id
=>
/[0-9]\.[0-9]\.[0-9]/
},
:member
=>
{
:mark
=>
:get
})
do
assert_recognizes
(
expected_options
,
:path
=>
'messages/1.1.1/mark'
,
:method
=>
:get
)
end
end
def
test_member_when_override_paths_for_default_restful_actions_with
[
:put
,
:post
].
each
do
|
method
|
with_restful_routing
:messages
,
:member
=>
{
:mark
=>
method
},
:path_names
=>
{
:new
=>
'nuevo'
}
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录