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

Merge pull request #674 from tricknotes/support-rails4.2-for-ams0.9

Browse Source 
Support Rails 4.2.0 with AMS 0.9
This commit is contained in:
Steve Klabnik 2014-10-09 12:38:57 -04:00
commit 784eccd5bc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/action_controller/serialization.rb
View File

@ -45,13 +45,15 @@ module ActionController
end
end
def _render_option_json(resource, options)
serializer = build_json_serializer(resource, options)
[:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
define_method renderer_method do |resource, options|
serializer = build_json_serializer(resource, options)
if serializer
super(serializer, options)
else
super
if serializer
super(serializer, options)
else
super(resource, options)
end
end
end