github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 19:32:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Detect arrays for serialization using respond_to?(:to_ary).

Browse Source 
This is the way AMS detects arrays, and is more robust than checking
is_a? for whitelisted classes. For example, this works for
ActiveRecord::AssociationRelation which the current logic does not
handle.
This commit is contained in:
Vikhyat Korrapati
2014-04-16 20:48:09 +05:30
parent cba7d3fc82
commit 8f53b7a65b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -169,9 +169,9 @@ class ApplicationController < ActionController::Base
def serialize_data(obj, serializer, opts={}) def serialize_data(obj, serializer, opts={})
# If it's an array, apply the serializer as an each_serializer to the elements # If it's an array, apply the serializer as an each_serializer to the elements
serializer_opts = {scope: guardian}.merge!(opts) serializer_opts = {scope: guardian}.merge!(opts)
if obj.is_a?(Array) or obj.is_a?(ActiveRecord::Associations::CollectionProxy) if obj.respond_to?(:to_ary)
serializer_opts[:each_serializer] = serializer serializer_opts[:each_serializer] = serializer
ActiveModel::ArraySerializer.new(obj, serializer_opts).as_json ActiveModel::ArraySerializer.new(obj.to_ary, serializer_opts).as_json
else else
serializer.new(obj, serializer_opts).as_json serializer.new(obj, serializer_opts).as_json
end end