resolve collection cache error

This commit is contained in:
quake wang
2017-09-08 18:51:51 +09:00
committed by Benjamin Fleischer
parent ca531789c3
commit a9ea81a831
2 changed files with 6 additions and 7 deletions

View File

@@ -19,11 +19,10 @@ module ActiveModel
# @api private
def serializable_hash(adapter_options, options, adapter_instance)
include_directive = ActiveModel::Serializer.include_directive_from_options(adapter_options)
adapter_options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(self, adapter_instance, include_directive)
adapter_opts = adapter_options.merge(include_directive: include_directive)
options[:include_directive] ||= ActiveModel::Serializer.include_directive_from_options(adapter_options)
options[:cached_attributes] ||= ActiveModel::Serializer.cache_read_multi(self, adapter_instance, options[:include_directive])
serializers.map do |serializer|
serializer.serializable_hash(adapter_opts, options, adapter_instance)
serializer.serializable_hash(adapter_options, options, adapter_instance)
end
end