ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-24 23:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the default value to the options param

Browse Source
This commit is contained in:
Santiago Pastorino 2014-01-03 20:02:43 -02:00
parent 5fa4002039
commit 78245b07bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/action_controller/serialization.rb
View File

@ -61,8 +61,8 @@ module ActionController
send(_serialization_scope) if _serialization_scope && respond_to?(_serialization_scope, true) send(_serialization_scope) if _serialization_scope && respond_to?(_serialization_scope, true)
end end
def build_json_serializer(resource, options) def build_json_serializer(resource, options = {})
options = default_serializer_options.merge(options || {}) options = default_serializer_options.merge(options)
if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource)) if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
options[:scope] = serialization_scope unless options.has_key?(:scope) options[:scope] = serialization_scope unless options.has_key?(:scope)