Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
403cce77
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,发现更多精彩内容 >>
提交
403cce77
编写于
2月 01, 2012
作者:
J
José Valim
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4828 from railsaholic/fix_error_message
fix has_one, has_many restrict error message
上级
6da8ec14
907d1934
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
4 deletion
+7
-4
activerecord/lib/active_record/associations/builder/association.rb
...ord/lib/active_record/associations/builder/association.rb
+2
-1
activerecord/lib/active_record/locale/en.yml
activerecord/lib/active_record/locale/en.yml
+3
-1
activerecord/test/cases/associations/has_many_associations_test.rb
...ord/test/cases/associations/has_many_associations_test.rb
+1
-1
activerecord/test/cases/associations/has_one_associations_test.rb
...cord/test/cases/associations/has_one_associations_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/associations/builder/association.rb
浏览文件 @
403cce77
...
...
@@ -74,7 +74,8 @@ def define_restrict_dependency_method
if
dependent_restrict_raises?
raise
ActiveRecord
::
DeleteRestrictionError
.
new
(
name
)
else
errors
.
add
(
:base
,
:restrict_dependent_destroy
,
:model
=>
name
.
to_s
.
singularize
)
key
=
association
(
name
).
reflection
.
macro
==
:has_one
?
"one"
:
"many"
errors
.
add
(
:base
,
:"restrict_dependent_destroy.
#{
key
}
"
,
:record
=>
name
)
return
false
end
end
...
...
activerecord/lib/active_record/locale/en.yml
浏览文件 @
403cce77
...
...
@@ -10,7 +10,9 @@ en:
messages
:
taken
:
"
has
already
been
taken"
record_invalid
:
"
Validation
failed:
%{errors}"
restrict_dependent_destroy
:
"
Cannot
delete
record
because
dependent
%{model}
exists"
restrict_dependent_destroy
:
one
:
"
Cannot
delete
record
because
a
dependent
%{record}
exists"
many
:
"
Cannot
delete
record
because
dependent
%{record}
exist"
# Append your own errors here or at the model/attributes scope.
# You can define own errors for models or model attributes.
...
...
activerecord/test/cases/associations/has_many_associations_test.rb
浏览文件 @
403cce77
...
...
@@ -1171,7 +1171,7 @@ def test_restrict_when_dependent_restrict_raises_config_set_to_false
assert
!
firm
.
errors
.
empty?
assert_equal
"Cannot delete record because dependent compan
y exists
"
,
firm
.
errors
[
:base
].
first
assert_equal
"Cannot delete record because dependent compan
ies exist
"
,
firm
.
errors
[
:base
].
first
assert
RestrictedFirm
.
exists?
(
:name
=>
'restrict'
)
assert
firm
.
companies
.
exists?
(
:name
=>
'child'
)
ensure
...
...
activerecord/test/cases/associations/has_one_associations_test.rb
浏览文件 @
403cce77
...
...
@@ -184,7 +184,7 @@ def test_dependence_with_restrict_with_dependent_restrict_raises_config_set_to_f
firm
.
destroy
assert
!
firm
.
errors
.
empty?
assert_equal
"Cannot delete record because dependent account exists"
,
firm
.
errors
[
:base
].
first
assert_equal
"Cannot delete record because
a
dependent account exists"
,
firm
.
errors
[
:base
].
first
assert
RestrictedFirm
.
exists?
(
:name
=>
'restrict'
)
assert
firm
.
account
.
present?
ensure
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录