Allow passing in the serializer class from the render method

This commit is contained in:
Carl Lerche
2012-01-20 12:17:37 -08:00
parent dd32f91a25
commit 4e8a2af1ec
2 changed files with 22 additions and 1 deletions

View File

@@ -44,7 +44,10 @@ module ActionController
options[:root] ||= controller_name
end
if json.respond_to?(:active_model_serializer) && (serializer = json.active_model_serializer)
serializer = options.delete(:serializer) ||
(json.respond_to?(:active_model_serializer) && json.active_model_serializer)
if serializer
options[:scope] = serialization_scope
if default_options = default_serializer_options