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.

Fixed: store `return_to` session for all admin controllers, eg. Order… (#13251)

Damian Legawiec83e593d15eae
diff --git a/admin/app/controllers/spree/admin/base_controller.rb b/admin/app/controllers/spree/admin/base_controller.rb
index 50588e7f76..58b92af77e 100644
--- a/admin/app/controllers/spree/admin/base_controller.rb
+++ b/admin/app/controllers/spree/admin/base_controller.rb
@@ -14,6 +14,7 @@ module Spree
helper 'spree/integrations'
before_action :authorize_admin
+ after_action :set_return_to, only: [:index]
protected
diff --git a/admin/app/controllers/spree/admin/resource_controller.rb b/admin/app/controllers/spree/admin/resource_controller.rb
index 8ef1f5f2e3..b1bb353792 100644
--- a/admin/app/controllers/spree/admin/resource_controller.rb
+++ b/admin/app/controllers/spree/admin/resource_controller.rb
@@ -4,7 +4,6 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
helper_method :new_object_url, :edit_object_url, :object_url, :collection_url, :model_class, :search_collection, :paginated_collection
before_action :load_resource
before_action :set_currency, :set_current_store, only: [:new, :create]
- after_action :set_return_to, only: [:index]
rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found