diff options
| author | Jose and Yehuda <wycats@gmail.com> | 2011-10-15 18:37:12 +0200 |
|---|---|---|
| committer | Jose and Yehuda <wycats@gmail.com> | 2011-10-15 18:40:38 +0200 |
| commit | 7a28498b55913aa0fd1d3529909ab57eaf64af0e (patch) | |
| tree | d26461bf010228a22956517e6317e421861d39d1 /activemodel/lib/active_model/serializer.rb | |
| parent | 322f47898e80af3fcdc3cb3db35e177d8216a2d2 (diff) | |
| download | rails-7a28498b55913aa0fd1d3529909ab57eaf64af0e.tar.gz rails-7a28498b55913aa0fd1d3529909ab57eaf64af0e.tar.bz2 rails-7a28498b55913aa0fd1d3529909ab57eaf64af0e.zip | |
Fix nil has_one association
Diffstat (limited to 'activemodel/lib/active_model/serializer.rb')
| -rw-r--r-- | activemodel/lib/active_model/serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serializer.rb b/activemodel/lib/active_model/serializer.rb index 99a007de31..1d11870bb4 100644 --- a/activemodel/lib/active_model/serializer.rb +++ b/activemodel/lib/active_model/serializer.rb @@ -31,11 +31,11 @@ module ActiveModel class HasOne < Config def serialize(object, scope) - serializer.new(object, scope).serializable_hash + object && serializer.new(object, scope).serializable_hash end def serialize_ids(object, scope) - object.read_attribute_for_serialization(:id) + object && object.read_attribute_for_serialization(:id) end end end |