Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Don't inherit from Spree::BaseController in frontend/backend

Damian Legawieca135a986a803
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
index 16b5a48fff..c8a8be6755 100644
--- a/backend/app/controllers/spree/admin/base_controller.rb
+++ b/backend/app/controllers/spree/admin/base_controller.rb
@@ -1,6 +1,17 @@
module Spree
module Admin
- class BaseController < Spree::BaseController
+ class BaseController < ApplicationController
+ include Spree::Core::ControllerHelpers::Auth
+ include Spree::Core::ControllerHelpers::Common
+ include Spree::Core::ControllerHelpers::Search
+ include Spree::Core::ControllerHelpers::Store
+ include Spree::Core::ControllerHelpers::StrongParameters
+ include Spree::Core::ControllerHelpers::Locale
+ include Spree::Core::ControllerHelpers::Currency
+
+ respond_to :html
+
+ helper 'spree/base'
helper 'spree/admin/navigation'
helper 'spree/locale'
helper 'spree/currency'
diff --git a/frontend/app/controllers/spree/content_controller.rb b/frontend/app/controllers/spree/content_controller.rb
index 16616f7ee4..d1c0a187fd 100644
--- a/frontend/app/controllers/spree/content_controller.rb
+++ b/frontend/app/controllers/spree/content_controller.rb
@@ -3,8 +3,6 @@ module Spree
# Don't serve local files or static assets
after_action :fire_visited_path, except: :cvv
- respond_to :html
-
def test; end
def cvv
diff --git a/frontend/app/controllers/spree/home_controller.rb b/frontend/app/controllers/spree/home_controller.rb
index 422e225ce1..85a245d8af 100644
--- a/frontend/app/controllers/spree/home_controller.rb
+++ b/frontend/app/controllers/spree/home_controller.rb
@@ -2,8 +2,6 @@ module Spree
class HomeController < Spree::StoreController
include Spree::CacheHelper
- respond_to :html
-
def index
if http_cache_enabled?
fresh_when etag: store_etag, last_modified: store_last_modified, public: true
diff --git a/frontend/app/controllers/spree/orders_controller.rb b/frontend/app/controllers/spree/orders_controller.rb
index c8617334ae..b41d6bac5b 100644
--- a/frontend/app/controllers/spree/orders_controller.rb
+++ b/frontend/app/controllers/spree/orders_controller.rb
@@ -5,8 +5,6 @@ module Spree
helper 'spree/products', 'spree/orders'
- respond_to :html
-
before_action :assign_order_with_lock, only: :update
def show
diff --git a/frontend/app/controllers/spree/products_controller.rb b/frontend/app/controllers/spree/products_controller.rb
index 67bf6e3263..869fb70f9e 100644
--- a/frontend/app/controllers/spree/products_controller.rb
+++ b/frontend/app/controllers/spree/products_controller.rb
@@ -9,8 +9,6 @@ module Spree
before_action :can_show_product?, only: :show
- respond_to :html
-
def index
@searcher = build_searcher(params.merge(include_images: true, current_store: current_store))
@products = @searcher.retrieve_products
diff --git a/frontend/app/controllers/spree/store_controller.rb b/frontend/app/controllers/spree/store_controller.rb
index 245b456b9b..6ad44fefe1 100644
--- a/frontend/app/controllers/spree/store_controller.rb
+++ b/frontend/app/controllers/spree/store_controller.rb
@@ -1,8 +1,18 @@
module Spree
- class StoreController < Spree::BaseController
+ class StoreController < ApplicationController
+ include Spree::Core::ControllerHelpers::Auth
+ include Spree::Core::ControllerHelpers::Common
+ include Spree::Core::ControllerHelpers::Search
+ include Spree::Core::ControllerHelpers::Store
+ include Spree::Core::ControllerHelpers::StrongParameters
+ include Spree::Core::ControllerHelpers::Locale
+ include Spree::Core::ControllerHelpers::Currency
include Spree::Core::ControllerHelpers::Order
include Spree::LocaleUrls
+ respond_to :html
+
+ helper 'spree/base'
helper 'spree/locale'
helper 'spree/currency'
diff --git a/frontend/app/controllers/spree/taxons_controller.rb b/frontend/app/controllers/spree/taxons_controller.rb
index bd10102d25..d6f239b27f 100644
--- a/frontend/app/controllers/spree/taxons_controller.rb
+++ b/frontend/app/controllers/spree/taxons_controller.rb
@@ -6,8 +6,6 @@ module Spree
before_action :load_taxon
- respond_to :html
-
def show
if !http_cache_enabled? || stale?(etag: etag, last_modified: last_modified, public: true)
load_products