sjs/grape-active_model_serializers
1
0
Fork 0
mirror of https://github.com/samsonjs/grape-active_model_serializers.git synced 2026-04-27 14:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reinstated parameter passing

Browse source
This commit is contained in:
Dan deHavilland 2013-05-14 12:57:38 +02:00
parent c91aa686d4
commit 2f69f318e0
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/grape-active_model_serializers/formatter.rb
View file

@ -30,10 +30,8 @@ module Grape
private private
def serializer(endpoint, resource, options) def serializer(endpoint, resource, options={})
# default_options = controller.send(:default_serializer_options) || {}
options = {} #default_options.merge(options || {})
serializer = options.delete(:serializer) || serializer = options.delete(:serializer) ||
(resource.respond_to?(:active_model_serializer) && (resource.respond_to?(:active_model_serializer) &&
resource.active_model_serializer) resource.active_model_serializer)