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

Prevent loading association when include_data is set to false (#1710)

Browse Source 
This should fix #1707.
This commit is contained in:
Yohan Robert
2016-05-25 02:46:22 +02:00
committed by L. Preston Sego III
parent cbca1350b9
commit a701777bd5
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/active_model/serializer/reflection.rb
View File

@@ -75,10 +75,10 @@ module ActiveModel
if block
block_value = instance_exec(serializer, &block)
if block_value == :nil
serializer.read_attribute_for_serialization(name)
else
if block_value != :nil
block_value
elsif @_include_data
serializer.read_attribute_for_serialization(name)
end
else
serializer.read_attribute_for_serialization(name)