Skip to content

Commit

Permalink
Fix spree issues spree#3531 and spree#2210 (patch provided by leiyang…
Browse files Browse the repository at this point in the history
…you)
  • Loading branch information
RohanM committed Aug 23, 2013
1 parent 4fa1f51 commit a08d74c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion core/lib/spree/core/controller_helpers/respond_with.rb
Expand Up @@ -7,7 +7,8 @@ def respond_with(*resources, &block)
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)

if defined_response = collector.response and !(Spree::BaseController.spree_responders[self.class.to_s.to_sym].try(:[], action_name.to_sym)
if action = options.delete(:action)
render :action => action
else
Expand Down

2 comments on commit a08d74c

@radar
Copy link

@radar radar commented on a08d74c Jan 20, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh really? Did you submit a patch for this?

@ceresfairfood
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I just applied the solution leiyangyou mentioned in spree#2210.

Please sign in to comment.