Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
697991a2
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,发现更多精彩内容 >>
提交
697991a2
编写于
4月 04, 2012
作者:
A
ara.t.howard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
carefully and quickly merge url_for options
上级
a9398a7d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
1 deletion
+26
-1
actionpack/lib/action_dispatch/routing/url_for.rb
actionpack/lib/action_dispatch/routing/url_for.rb
+17
-1
actionpack/test/controller/url_for_test.rb
actionpack/test/controller/url_for_test.rb
+9
-0
未找到文件。
actionpack/lib/action_dispatch/routing/url_for.rb
浏览文件 @
697991a2
...
...
@@ -147,7 +147,7 @@ def url_for(options = nil)
when
String
options
when
nil
,
Hash
_routes
.
url_for
(
(
options
||
{}).
symbolize_keys
.
reverse_merge!
(
url_options
))
_routes
.
url_for
(
_merge_url_for_options
(
options
,
url_options
))
else
polymorphic_url
(
options
)
end
...
...
@@ -155,6 +155,22 @@ def url_for(options = nil)
protected
def
_merge_url_for_options
(
h1
,
h2
)
opts
=
{}
h1
.
keys
.
each
do
|
k
|
s
=
k
.
to_sym
opts
[
s
]
=
h1
[
k
]
unless
opts
.
has_key?
(
s
)
end
if
h1
h2
.
keys
.
each
do
|
k
|
s
=
k
.
to_sym
opts
[
s
]
=
h2
[
k
]
unless
opts
.
has_key?
(
s
)
end
if
h2
opts
end
def
optimize_routes_generation?
return
@_optimized_routes
if
defined?
(
@_optimized_routes
)
@_optimized_routes
=
_routes
.
optimize_routes_generation?
&&
default_url_options
.
empty?
...
...
actionpack/test/controller/url_for_test.rb
浏览文件 @
697991a2
...
...
@@ -356,6 +356,15 @@ def test_with_hash_with_indifferent_access
assert_equal
(
"/c/a"
,
W
.
new
.
url_for
(
HashWithIndifferentAccess
.
new
(
'controller'
=>
'c'
,
'action'
=>
'a'
,
'only_path'
=>
true
)))
end
def
test_with_stringified_default_url_options
W
.
default_url_options
[
'controller'
]
=
'd'
W
.
default_url_options
[
'only_path'
]
=
false
assert_equal
(
"/c"
,
W
.
new
.
url_for
(
:controller
=>
'c'
,
:only_path
=>
true
))
W
.
default_url_options
[
'action'
]
=
'b'
assert_equal
(
"/c/a"
,
W
.
new
.
url_for
(
:controller
=>
'c'
,
:action
=>
'a'
,
:only_path
=>
true
))
end
def
test_url_params_with_nil_to_param_are_not_in_url
assert_equal
(
"/c/a"
,
W
.
new
.
url_for
(
:only_path
=>
true
,
:controller
=>
'c'
,
:action
=>
'a'
,
:id
=>
Struct
.
new
(
:to_param
).
new
(
nil
)))
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录