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 #949 from edwardloveall/el-870-fix

Browse Source 
Don't pass serializer option to associated serializers
This commit is contained in:
João Moura
2015-06-13 03:01:25 -03:00
parent 6251b90d25 14439aada4
commit de23501995
6 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/active_model/serializer.rb
View File

@@ -220,7 +220,7 @@ module ActiveModel
if serializer_class
serializer = serializer_class.new(
association_value,
options.merge(serializer_from_options(association_options))
options.except(:serializer).merge(serializer_from_options(association_options))
)
elsif !association_value.nil? && !association_value.instance_of?(Object)
association_options[:association_options][:virtual_value] = association_value