ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #452 from plexus/has_one_each_serializer_fix

Browse Source 
Using a HasOne association twice raises an exception (Undefined method `map')
This commit is contained in:
Santiago Pastorino
2013-12-16 17:49:26 -08:00
parent 700e6b83c1 8c3866532a
commit 80d9fb56d2
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer/associations.rb
View File

@@ -53,7 +53,7 @@ module ActiveModel
end
def build_serializer(object, options = {})
if object.respond_to?(:to_ary)
if object.respond_to?(:to_ary) && !(@serializer_class && @serializer_class <= ArraySerializer)
use_array_serializer!
else
@serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer