Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d341d166
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,发现更多精彩内容 >>
提交
d341d166
编写于
5月 26, 2011
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1344 from jmileham/serialization_includes
AR Serialization shouldn't fall back to base opts for includes
上级
5083d70f
043b6243
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
6 deletion
+11
-6
activerecord/lib/active_record/serialization.rb
activerecord/lib/active_record/serialization.rb
+2
-6
activerecord/test/cases/json_serialization_test.rb
activerecord/test/cases/json_serialization_test.rb
+9
-0
未找到文件。
activerecord/lib/active_record/serialization.rb
浏览文件 @
d341d166
...
...
@@ -31,9 +31,6 @@ def serializable_hash(options = nil)
def
serializable_add_includes
(
options
=
{})
return
unless
include_associations
=
options
.
delete
(
:include
)
base_only_or_except
=
{
:except
=>
options
[
:except
],
:only
=>
options
[
:only
]
}
include_has_options
=
include_associations
.
is_a?
(
Hash
)
associations
=
include_has_options
?
include_associations
.
keys
:
Array
.
wrap
(
include_associations
)
...
...
@@ -46,9 +43,8 @@ def serializable_add_includes(options = {})
end
if
records
association_options
=
include_has_options
?
include_associations
[
association
]
:
base_only_or_except
opts
=
options
.
merge
(
association_options
)
yield
(
association
,
records
,
opts
)
association_options
=
include_has_options
?
include_associations
[
association
]
:
{}
yield
(
association
,
records
,
association_options
)
end
end
...
...
activerecord/test/cases/json_serialization_test.rb
浏览文件 @
d341d166
...
...
@@ -161,6 +161,15 @@ def test_includes_fetches_nth_level_associations
assert_match
%r{"tag":
\{
"name":"General"
\}
}
,
json
end
def
test_includes_doesnt_merge_opts_from_base
json
=
@david
.
to_json
(
:only
=>
:id
,
:include
=>
:posts
)
assert_match
%{"title":"Welcome to the weblog"}
,
json
end
def
test_should_not_call_methods_on_associations_that_dont_respond
def
@david
.
favorite_quote
;
"Constraints are liberating"
;
end
json
=
@david
.
to_json
(
:include
=>
:posts
,
:methods
=>
:favorite_quote
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录