diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 11:06:17 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 11:06:17 -0300 |
commit | bed2bdb17c50f72e61769c98cd839548da760ca9 (patch) | |
tree | a136d27e7a82e4f8fcc952d229c929ea25baa04f /activerecord/lib/active_record | |
parent | 6442c90f098f7095ada0cd66bb7291b6798a5583 (diff) | |
parent | 0bc6c2578635d5acedcfef90c8cd7a45fa5604c7 (diff) | |
download | rails-bed2bdb17c50f72e61769c98cd839548da760ca9.tar.gz rails-bed2bdb17c50f72e61769c98cd839548da760ca9.tar.bz2 rails-bed2bdb17c50f72e61769c98cd839548da760ca9.zip |
Merge pull request #15746 from amccloud/auto-inverse_of-in-module
Fixed automatic inverse_of for models nested in module
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/reflection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 9849e03036..dd746a4e10 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -499,7 +499,7 @@ module ActiveRecord # returns either nil or the inverse association name that it finds. def automatic_inverse_of if can_find_inverse_of_automatically?(self) - inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name).to_sym + inverse_name = ActiveSupport::Inflector.underscore(options[:as] || active_record.name.demodulize).to_sym begin reflection = klass._reflect_on_association(inverse_name) |