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

Fix default serializer option

Browse Source
This commit is contained in:
Gauthier Delacroix
2014-09-03 14:57:00 +02:00
parent 8514528db7
commit 4d3d234dda
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/action_controller/serialization.rb
View File

@@ -80,13 +80,14 @@ module ActionController
def build_json_serializer(resource, options = {}) def build_json_serializer(resource, options = {})
options = default_serializer_options.merge(options) options = default_serializer_options.merge(options)
@namespace_for_serializer = options.fetch(:namespace, nil)
if serializer = options.fetch(:serializer, default_serializer(resource)) if serializer = options.fetch(:serializer, default_serializer(resource))
options[:scope] = serialization_scope unless options.has_key?(:scope) options[:scope] = serialization_scope unless options.has_key?(:scope)
if resource.respond_to?(:to_ary) if resource.respond_to?(:to_ary)
options[:resource_name] ||= controller_name options[:resource_name]= controller_name
options[:namespace] ||= namespace_for_serializer if namespace_for_serializer options[:namespace] = namespace_for_serializer if namespace_for_serializer
end end
serializer.new(resource, options) serializer.new(resource, options)