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

scope option to render takes precedence over serialization_scope

Browse Source
This commit is contained in:
Ray Cohen 2012-07-28 19:05:45 -04:00
parent 1e7c69c729
commit 424dacb457
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/action_controller/serialization.rb
View File

@ -52,7 +52,7 @@ module ActionController
end end
if serializer if serializer
options[:scope] = serialization_scope options[:scope] = serialization_scope unless options.has_key?(:scope)
options[:url_options] = url_options options[:url_options] = url_options
json = serializer.new(json, options.merge(default_serializer_options || {})) json = serializer.new(json, options.merge(default_serializer_options || {}))
end end

4
test/serialization_test.rb
View File

@ -133,8 +133,8 @@ class RenderJsonTest < ActionController::TestCase
def render_json_with_serializer_and_scope_option def render_json_with_serializer_and_scope_option
@current_user = Struct.new(:as_json).new(:current_user => true) @current_user = Struct.new(:as_json).new(:current_user => true)
@scope = Struct.new(:as_json).new(:current_user => false) scope = Struct.new(:as_json).new(:current_user => false)
render :json => JsonSerializable.new, :scope => @scope render :json => JsonSerializable.new, :scope => scope
end end
def render_json_with_serializer_api_but_without_serializer def render_json_with_serializer_api_but_without_serializer