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

Merge pull request #655 from wouterw/ww-rails-4.2.0

Browse Source 
Fix Rails Master
This commit is contained in:
Steve Klabnik 2014-09-19 12:37:50 -04:00
commit a65e86bb52
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/action_controller/serialization.rb
View File

@ -33,19 +33,22 @@ module ActionController
end end
def serialization_scope def serialization_scope
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 default_serializer_options def default_serializer_options
end end
def _render_option_json(resource, options) [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
json = ActiveModel::Serializer.build_json(self, resource, options) define_method renderer_method do |resource, options|
json = ActiveModel::Serializer.build_json(self, resource, options)
if json if json
super(json, options) super(json, options)
else else
super super
end
end end
end end