diff options
| author | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2010-12-20 11:23:07 -0300 |
| commit | 02fc6fbccdd3345e95592cc14e7855e2f1ea14b3 (patch) | |
| tree | b26b91e2b2fad62ec382c9cee4ca2ac318f09257 /activemodel/lib/active_model/errors.rb | |
| parent | 2ba06b48defaca940e7c878724e2fb1c090eaa92 (diff) | |
| parent | 0cbfd6c28d327304432f7d0c067662b5c1e41a78 (diff) | |
| download | rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.gz rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.tar.bz2 rails-02fc6fbccdd3345e95592cc14e7855e2f1ea14b3.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/persistence.rb
Diffstat (limited to 'activemodel/lib/active_model/errors.rb')
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 99f47f2cbe..fdca852c7a 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -165,7 +165,13 @@ module ActiveModel # Returns an ActiveSupport::OrderedHash that can be used as the JSON representation for this object. def as_json(options=nil) - self + to_hash + end + + def to_hash + hash = ActiveSupport::OrderedHash.new + each { |k, v| (hash[k] ||= []) << v } + hash end # Adds +message+ to the error messages on +attribute+, which will be returned on a call to |