Pass options through when using default serializer

This commit is contained in:
Kevin Mahoney 2013-03-22 13:12:33 +00:00
parent 680e2efbec
commit 2bd447d69d
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ module ActiveModel
serializer = item.active_model_serializer serializer = item.active_model_serializer
end end
serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item) serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item, @options)
if serializable.respond_to?(:serializable_hash) if serializable.respond_to?(:serializable_hash)
serializable.serializable_hash serializable.serializable_hash

View File

@ -504,7 +504,7 @@ module ActiveModel
end end
def serializable_hash def serializable_hash
@object.as_json @object.as_json(@options)
end end
end end
end end