raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace usages of Spree::BaseController with ApplicationController

Browse Source
This commit is contained in:
Luis Ramos
2020-11-01 11:11:28 +00:00
parent 7a22367b4a
commit 4060e7debf
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
module Spree
module Admin
class BaseController < Spree::BaseController
class BaseController < ApplicationController
ssl_required
helper 'spree/admin/navigation'

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

@@ -16,7 +16,7 @@ module ActionController
# 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(:[],
!ApplicationController.spree_responders[self.class.to_s.to_sym].try(:[],
action_name.to_sym)
if action = options.delete(:action)
render action: action

2
lib/spree/i18n/initializer.rb
View File

@@ -1,3 +1,3 @@
# frozen_string_literal: true
Spree::BaseController.include(Spree::ViewContext)
ApplicationController.include(Spree::ViewContext)

2
lib/spree/responder.rb
View File

@@ -10,7 +10,7 @@ module Spree
class_name = controller.class.name.to_sym
action_name = options.delete(:action_name)
result = Spree::BaseController.spree_responders[class_name].
result = ApplicationController.spree_responders[class_name].
try(:[], action_name).
try(:[], self.format.to_sym)
return unless result