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

Fix and test for #490

Browse Source
This commit is contained in:
Tony Novak
2015-01-30 13:49:15 -08:00
parent f71ac766ef
commit 263b66e423
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer/association/has_one.rb
View File

@@ -12,7 +12,7 @@ module ActiveModel
end
def serializer_class(object, options = {})
serializer_from_options || serializer_from_object(object, options) || default_serializer
(serializer_from_options unless object.nil?) || serializer_from_object(object, options) || default_serializer
end
def build_serializer(object, options = {})