raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-28 01:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with each_serializer not being called in some cases in Rails 4.

Browse Source
This commit is contained in:
Matt-Yorkley
2020-01-12 12:47:26 +01:00
parent 6bb4f2477c
commit 57ca1d54bb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/spree/admin/base_controller.rb
View File

@@ -1,3 +1,4 @@
# rubocop:disable Metrics/ClassLength
module Spree
module Admin
class BaseController < Spree::BaseController
@@ -121,13 +122,17 @@ module Spree
def render_as_json(data, options = {})
ams_prefix = options.delete :ams_prefix
if [Array, ActiveRecord::Relation].include? data.class
if each_serializer_required?(data)
render options.merge(json: data, each_serializer: serializer(ams_prefix))
else
render options.merge(json: data, serializer: serializer(ams_prefix))
end
end
def each_serializer_required?(data)
['Array', 'ActiveRecord::Relation'].include?(data.class.name)
end
def serializer(ams_prefix)
unless ams_prefix.nil? || ams_prefix_whitelist.include?(ams_prefix.to_sym)
raise "Suffix '#{ams_prefix}' not found in ams_prefix_whitelist for #{self.class.name}."
@@ -140,3 +145,4 @@ module Spree
end
end
end
# rubocop:enable Metrics/ClassLength