diff options
| author | Manoj <manoj.mk27@gmail.com> | 2012-02-01 23:55:01 +0530 |
|---|---|---|
| committer | Manoj <manoj.mk27@gmail.com> | 2012-02-01 23:58:20 +0530 |
| commit | 907d19343ebe2f0807337e0fda83b23076f87383 (patch) | |
| tree | b7c989d3754933a83fa8f7f9576ae09c71357a14 /activerecord/lib/active_record/associations/builder/association.rb | |
| parent | 049dc500b632ca1a05d41a0c5454946f24d15035 (diff) | |
| download | rails-907d19343ebe2f0807337e0fda83b23076f87383.tar.gz rails-907d19343ebe2f0807337e0fda83b23076f87383.tar.bz2 rails-907d19343ebe2f0807337e0fda83b23076f87383.zip | |
fix has_one, has_many restrict error message
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/association.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/association.rb b/activerecord/lib/active_record/associations/builder/association.rb index c3fa4a05fd..0410c3a3c1 100644 --- a/activerecord/lib/active_record/associations/builder/association.rb +++ b/activerecord/lib/active_record/associations/builder/association.rb @@ -74,7 +74,8 @@ module ActiveRecord::Associations::Builder 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 |