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

Merge decorator into the class brought from spree

Browse Source
This commit is contained in:
Luis Ramos
2020-06-27 12:48:12 +01:00
parent 1167a1a9bb
commit a3ea4b757d
2 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spree/core/controller_helpers/respond_with.rb
View File

@@ -1,21 +1,24 @@
module ActionController
class Base
def respond_with(*resources, &block)
raise "In order to use respond_with, first you need to declare the formats your " <<
"controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
if self.class.mimes_for_respond_to.empty?
raise "In order to use respond_with, first you need to declare the formats your " \
"controller responds to in the class level"
end
if collector = retrieve_collector_from_mimes(&block)
options = resources.size == 1 ? {} : resources.extract_options!
if defined_response = collector.response and !Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
# Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
if (defined_response = collector.response) && !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
if action = options.delete(:action)
render :action => action
render action: action
else
defined_response.call
end
else
# The action name is needed for processing
options.merge!(:action_name => action_name.to_sym)
options[:action_name] = action_name.to_sym
# If responder is not specified then pass in Spree::Responder
(options.delete(:responder) || Spree::Responder).call(self, resources, options)
end

28
lib/spree/core/controller_helpers/respond_with_decorator.rb
View File

@@ -1,28 +0,0 @@
module ActionController
class Base
def respond_with(*resources, &block)
if self.class.mimes_for_respond_to.empty?
raise "In order to use respond_with, first you need to declare the formats your " \
"controller responds to in the class level"
end
if collector = retrieve_collector_from_mimes(&block)
options = resources.size == 1 ? {} : resources.extract_options!
# Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
if (defined_response = collector.response) && !Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
if action = options.delete(:action)
render action: action
else
defined_response.call
end
else
# The action name is needed for processing
options[:action_name] = action_name.to_sym
# If responder is not specified then pass in Spree::Responder
(options.delete(:responder) || Spree::Responder).call(self, resources, options)
end
end
end
end
end