Skip to content

Commit 855ee3b

Browse files
committed
Fix ActiveRecord::Associations::CollectionProxy serialization in Rails 4.
1 parent 04aa169 commit 855ee3b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def guardian
134134
def serialize_data(obj, serializer, opts={})
135135
# If it's an array, apply the serializer as an each_serializer to the elements
136136
serializer_opts = {scope: guardian}.merge!(opts)
137-
if obj.is_a?(Array)
137+
if obj.is_a?(Array) or obj.is_a?(ActiveRecord::Associations::CollectionProxy)
138138
serializer_opts[:each_serializer] = serializer
139139
ActiveModel::ArraySerializer.new(obj, serializer_opts).as_json
140140
else

0 commit comments

Comments
 (0)