diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-09-17 16:25:01 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-09-17 16:30:10 +0200 |
| commit | 9feda8f21186e61d90373c8927ff7316c6db8e58 (patch) | |
| tree | 4418eab16842a116e4e974c41de3dddaa40292fe /activerecord/lib | |
| parent | 1ebd987aeba95ee65fc2647581fb87fed55a0a23 (diff) | |
| parent | 8fbd858c85f5f4c00a7a7d650dc61f4b54965069 (diff) | |
| download | rails-9feda8f21186e61d90373c8927ff7316c6db8e58.tar.gz rails-9feda8f21186e61d90373c8927ff7316c6db8e58.tar.bz2 rails-9feda8f21186e61d90373c8927ff7316c6db8e58.zip | |
Merge pull request #21581 from ronakjangir47/restrict_with_error
`restrict_with_error` message will now respect owner’s human name
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index f8211ef9fb..38bda0d2a5 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -15,7 +15,7 @@ module ActiveRecord when :restrict_with_error unless empty? - record = klass.human_attribute_name(reflection.name).downcase + record = owner.class.human_attribute_name(reflection.name).downcase message = owner.errors.generate_message(:base, :'restrict_dependent_destroy.many', record: record, raise: true) rescue nil if message ActiveSupport::Deprecation.warn(<<-MESSAGE.squish) diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 1829453d73..b1e05c32b5 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -11,7 +11,7 @@ module ActiveRecord when :restrict_with_error if load_target - record = klass.human_attribute_name(reflection.name).downcase + record = owner.class.human_attribute_name(reflection.name).downcase message = owner.errors.generate_message(:base, :'restrict_dependent_destroy.one', record: record, raise: true) rescue nil if message ActiveSupport::Deprecation.warn(<<-MESSAGE.squish) |