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

Revert 37b0690fb8.

Browse Source 
This feature causes more problems than it solves.
This commit is contained in:
Steve Klabnik
2013-04-03 17:24:08 -07:00
parent 8d7252019c
commit 9551a97464
7 changed files with 8 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/action_controller/serialization.rb
View File

@@ -30,17 +30,6 @@ module ActionController
included do
class_attribute :_serialization_scope
self._serialization_scope = :current_user
unless self.respond_to?(:responder=)
include ActionController::MimeResponds
end
self.responder = ActiveModel::Serializer::Responder
self.respond_to :json
unless ActiveModel::Serializer.use_default_render_json
self.send(:include, RenderJsonOverride)
end
end
def serialization_scope
@@ -50,15 +39,13 @@ module ActionController
def default_serializer_options
end
module RenderJsonOverride
def _render_option_json(resource, options)
json = ActiveModel::Serializer.build_json(self, resource, options)
def _render_option_json(resource, options)
json = ActiveModel::Serializer.build_json(self, resource, options)
if json
super(json, options)
else
super
end
if json
super(json, options)
else
super
end
end