Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
0ddb9d64
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,发现更多精彩内容 >>
提交
0ddb9d64
编写于
12月 15, 2011
作者:
J
Jon Leighton
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3991 from akaspick/attrfix
Allow nested attributes in associations to update values in it's owner o...
上级
ad87752a
774ff18c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
2 deletion
+22
-2
activerecord/lib/active_record/associations/association.rb
activerecord/lib/active_record/associations/association.rb
+2
-0
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/base.rb
+11
-1
activerecord/test/cases/nested_attributes_test.rb
activerecord/test/cases/nested_attributes_test.rb
+5
-0
activerecord/test/models/bird.rb
activerecord/test/models/bird.rb
+4
-1
未找到文件。
activerecord/lib/active_record/associations/association.rb
浏览文件 @
0ddb9d64
...
...
@@ -230,6 +230,8 @@ def association_class
end
def
build_record
(
attributes
,
options
)
attributes
=
(
attributes
||
{}).
reverse_merge
(
creation_attributes
)
reflection
.
build_association
(
attributes
,
options
)
do
|
record
|
record
.
assign_attributes
(
create_scope
.
except
(
*
record
.
changed
),
...
...
activerecord/lib/active_record/base.rb
浏览文件 @
0ddb9d64
...
...
@@ -1776,6 +1776,7 @@ def assign_attributes(new_attributes, options = {})
attributes
=
new_attributes
.
stringify_keys
multi_parameter_attributes
=
[]
nested_parameter_attributes
=
[]
@mass_assignment_options
=
options
unless
options
[
:without_protection
]
...
...
@@ -1786,12 +1787,21 @@ def assign_attributes(new_attributes, options = {})
if
k
.
include?
(
"("
)
multi_parameter_attributes
<<
[
k
,
v
]
elsif
respond_to?
(
"
#{
k
}
="
)
send
(
"
#{
k
}
="
,
v
)
if
v
.
is_a?
(
Hash
)
nested_parameter_attributes
<<
[
k
,
v
]
else
send
(
"
#{
k
}
="
,
v
)
end
else
raise
(
UnknownAttributeError
,
"unknown attribute:
#{
k
}
"
)
end
end
# assign any deferred nested attributes after the base attributes have been set
nested_parameter_attributes
.
each
do
|
k
,
v
|
send
(
"
#{
k
}
="
,
v
)
end
@mass_assignment_options
=
nil
assign_multiparameter_attributes
(
multi_parameter_attributes
)
end
...
...
activerecord/test/cases/nested_attributes_test.rb
浏览文件 @
0ddb9d64
...
...
@@ -617,6 +617,11 @@ def test_should_take_a_hash_with_composite_id_keys_and_assign_the_attributes_to_
assert_equal
[
'Grace OMalley'
,
'Privateers Greed'
],
[
@child_1
.
name
,
@child_2
.
name
]
end
def
test_should_take_a_hash_with_owner_attributes_and_assign_the_attributes_to_the_associated_model
@pirate
.
birds
.
create
:name
=>
'bird'
,
:pirate_attributes
=>
{
:id
=>
@pirate
.
id
.
to_s
,
:catchphrase
=>
'Holla!'
}
assert_equal
'Holla!'
,
@pirate
.
reload
.
catchphrase
end
def
test_should_raise_RecordNotFound_if_an_id_is_given_but_doesnt_return_a_record
assert_raise_with_message
ActiveRecord
::
RecordNotFound
,
"Couldn't find
#{
@child_1
.
class
.
name
}
with ID=1234567890 for Pirate with ID=
#{
@pirate
.
id
}
"
do
@pirate
.
attributes
=
{
association_getter
=>
[{
:id
=>
1234567890
}]
}
...
...
activerecord/test/models/bird.rb
浏览文件 @
0ddb9d64
class
Bird
<
ActiveRecord
::
Base
belongs_to
:pirate
validates_presence_of
:name
accepts_nested_attributes_for
:pirate
attr_accessor
:cancel_save_from_callback
before_save
:cancel_save_callback_method
,
:if
=>
:cancel_save_from_callback
def
cancel_save_callback_method
false
end
end
\ No newline at end of file
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录