aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-02-01 15:45:11 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-02-01 17:03:15 -0200
commita73662f3d8d9ce1a0c54bc0254024c5ecc7cb1a2 (patch)
tree70d8a1e9029a4ea54ec7be1bd52758ee579d9d17 /activerecord/lib/active_record/associations
parent403cce77f19bc6c2a3d8acaf547991078a540eaf (diff)
downloadrails-a73662f3d8d9ce1a0c54bc0254024c5ecc7cb1a2.tar.gz
rails-a73662f3d8d9ce1a0c54bc0254024c5ecc7cb1a2.tar.bz2
rails-a73662f3d8d9ce1a0c54bc0254024c5ecc7cb1a2.zip
Use human attribute name to show the dependent destroy message
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/builder/association.rb3
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 0410c3a3c1..2059d8acdf 100644
--- a/activerecord/lib/active_record/associations/builder/association.rb
+++ b/activerecord/lib/active_record/associations/builder/association.rb
@@ -75,7 +75,8 @@ module ActiveRecord::Associations::Builder
raise ActiveRecord::DeleteRestrictionError.new(name)
else
key = association(name).reflection.macro == :has_one ? "one" : "many"
- errors.add(:base, :"restrict_dependent_destroy.#{key}", :record => name)
+ errors.add(:base, :"restrict_dependent_destroy.#{key}",
+ :record => self.class.human_attribute_name(name).downcase)
return false
end
end