Skip to content

Commit 447d969

Browse files
committed
Support Rails 4.2.0 with AMS 0.9
This patch is the same fixes as #655 and #663 for 0-9-stable branch.
1 parent 5acd98e commit 447d969

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

lib/action_controller/serialization.rb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@ def serialization_scope(scope)
4545
end
4646
end
4747

48-
def _render_option_json(resource, options)
49-
serializer = build_json_serializer(resource, options)
50-
51-
if serializer
52-
super(serializer, options)
53-
else
54-
super
48+
[:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
49+
define_method renderer_method do |resource, options|
50+
serializer = build_json_serializer(resource, options)
51+
52+
if serializer
53+
super(serializer, options)
54+
else
55+
super(resource, options)
56+
end
5557
end
5658
end
5759

0 commit comments

Comments
 (0)