diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-20 23:22:30 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-20 23:22:30 +0000 |
| commit | e86d1cd621ca62af6f71b04032b1e07a66c06bb6 (patch) | |
| tree | 638a89da26f9066cc333f0ce059c3ce551a97d24 /activerecord/lib/active_record/associations/association_collection.rb | |
| parent | dc399b96c84bc66b7c20e92fb40e9ed00daf99c2 (diff) | |
| download | rails-e86d1cd621ca62af6f71b04032b1e07a66c06bb6.tar.gz rails-e86d1cd621ca62af6f71b04032b1e07a66c06bb6.tar.bz2 rails-e86d1cd621ca62af6f71b04032b1e07a66c06bb6.zip | |
Added ActiveRecord::Base#to_json/from_json (currently does not support :include like to_xml) [DHH]. Added ActiveRecord::Base#from_xml [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 460f410cf0..66ee712d7d 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -158,6 +158,7 @@ module ActiveRecord end end + protected def method_missing(method, *args, &block) if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method)) @@ -218,4 +219,4 @@ module ActiveRecord end end -end +end
\ No newline at end of file |