Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
022c7979
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,发现更多精彩内容 >>
提交
022c7979
编写于
5月 03, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14924 from eric-chahin/issue_13854
Fixed custom validation context bug for child associations
上级
193eb625
c6d685ba
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
1 deletion
+31
-1
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+7
-0
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/autosave_association.rb
+2
-1
activerecord/test/cases/associations/has_many_associations_test.rb
...ord/test/cases/associations/has_many_associations_test.rb
+10
-0
activerecord/test/models/pirate.rb
activerecord/test/models/pirate.rb
+6
-0
activerecord/test/models/ship.rb
activerecord/test/models/ship.rb
+6
-0
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
022c7979
*
Rails will now pass a custom validation context through to autosave associations
in order to validate child associations with the same context.
Fixes #13854.
*Eric Chahin*, *Aaron Nelson*, *Kevin Casey*
*
Stringify all variable keys of mysql connection configuration.
When the `sql_mode` variable for mysql adapters is set in the configuration
...
...
activerecord/lib/active_record/autosave_association.rb
浏览文件 @
022c7979
...
...
@@ -304,7 +304,8 @@ def validate_collection_association(reflection)
def
association_valid?
(
reflection
,
record
)
return
true
if
record
.
destroyed?
||
record
.
marked_for_destruction?
unless
valid
=
record
.
valid?
validation_context
=
self
.
validation_context
unless
[
:create
,
:update
].
include?
(
self
.
validation_context
)
unless
valid
=
record
.
valid?
(
validation_context
)
if
reflection
.
options
[
:autosave
]
record
.
errors
.
each
do
|
attribute
,
message
|
attribute
=
"
#{
reflection
.
name
}
.
#{
attribute
}
"
...
...
activerecord/test/cases/associations/has_many_associations_test.rb
浏览文件 @
022c7979
...
...
@@ -26,6 +26,8 @@
require
'models/job'
require
'models/college'
require
'models/student'
require
'models/pirate'
require
'models/ship'
class
HasManyAssociationsTestForReorderWithJoinDependency
<
ActiveRecord
::
TestCase
fixtures
:authors
,
:posts
,
:comments
...
...
@@ -1883,4 +1885,12 @@ def test_collection_association_with_private_kernel_method
end
end
end
test
'has_many_association passes context validation to validate children'
do
pirate
=
FamousPirate
.
new
pirate
.
famous_ships
<<
ship
=
FamousShip
.
new
assert_equal
true
,
pirate
.
valid?
assert_equal
false
,
pirate
.
valid?
(
:conference
)
assert_equal
"can't be blank"
,
ship
.
errors
[
:name
].
first
end
end
activerecord/test/models/pirate.rb
浏览文件 @
022c7979
...
...
@@ -84,3 +84,9 @@ def log(record, callback)
class
DestructivePirate
<
Pirate
has_one
:dependent_ship
,
:class_name
=>
'Ship'
,
:foreign_key
=>
:pirate_id
,
:dependent
=>
:destroy
end
class
FamousPirate
<
ActiveRecord
::
Base
self
.
table_name
=
'pirates'
has_many
:famous_ships
validates_presence_of
:catchphrase
,
on: :conference
end
\ No newline at end of file
activerecord/test/models/ship.rb
浏览文件 @
022c7979
...
...
@@ -17,3 +17,9 @@ def cancel_save_callback_method
false
end
end
class
FamousShip
<
ActiveRecord
::
Base
self
.
table_name
=
'ships'
belongs_to
:famous_pirate
validates_presence_of
:name
,
on: :conference
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录