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.

Added universal Base#for_store method

Damian Legawiec2aefb8daae21
diff --git a/api/app/controllers/spree/api/v2/resource_controller.rb b/api/app/controllers/spree/api/v2/resource_controller.rb
index 9e6bf0829a..93e65a0edf 100644
--- a/api/app/controllers/spree/api/v2/resource_controller.rb
+++ b/api/app/controllers/spree/api/v2/resource_controller.rb
@@ -27,14 +27,7 @@ module Spree
end
def scope(skip_cancancan: false)
- plural_model_name = model_class.model_name.plural.gsub(/spree_/, '').to_sym
-
- base_scope = if current_store.respond_to?(plural_model_name)
- current_store.send(plural_model_name)
- else
- model_class
- end
-
+ base_scope = model_class.for_store(current_store)
base_scope = base_scope.accessible_by(current_ability, :show) unless skip_cancancan
base_scope = base_scope.includes(scope_includes) if scope_includes.any?
base_scope
diff --git a/backend/app/controllers/spree/admin/resource_controller.rb b/backend/app/controllers/spree/admin/resource_controller.rb
index 3e1678801e..fed8a8d942 100644
--- a/backend/app/controllers/spree/admin/resource_controller.rb
+++ b/backend/app/controllers/spree/admin/resource_controller.rb
@@ -64,9 +64,11 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
end
def update_positions
+ base_scope = model_class.try(:for_store, current_store) || model_class
+
ApplicationRecord.transaction do
params[:positions].each do |id, index|
- model_class.find(id).set_list_position(index)
+ base_scope.find(id).set_list_position(index)
end
end
@@ -154,7 +156,9 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
def parent
if parent_data.present?
- @parent ||= parent_data[:model_class].
+ base_scope = parent_data[:model_class].try(:for_store, current_store) || parent_data[:model_class]
+
+ @parent ||= base_scope.
# Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bug
send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
instance_variable_set("@#{resource.model_name}", @parent)
@@ -165,7 +169,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
if parent_data.present?
parent.send(controller_name).find(params[:id])
else
- model_class.find(params[:id])
+ base_scope = model_class.try(:for_store, current_store) || model_class
+ base_scope.find(params[:id])
end
end
diff --git a/core/app/models/concerns/spree/multiple_stores_resource.rb b/core/app/models/concerns/spree/multiple_stores_resource.rb
index d61a5ee172..ff8c7c2702 100644
--- a/core/app/models/concerns/spree/multiple_stores_resource.rb
+++ b/core/app/models/concerns/spree/multiple_stores_resource.rb
@@ -3,8 +3,6 @@ module Spree
extend ActiveSupport::Concern
included do
- scope :for_store, ->(store) { joins(:stores).where(Store.table_name => { id: store.id }) }
-
validate :must_have_one_store, unless: :disable_store_presence_validation?
end
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb
index 32d5361031..b2a4ca5d5e 100644
--- a/core/app/models/spree/base.rb
+++ b/core/app/models/spree/base.rb
@@ -22,6 +22,16 @@ class Spree::Base < ApplicationRecord
false
end
+ def self.for_store(store)
+ plural_model_name = model_name.plural.gsub(/spree_/, '').to_sym
+
+ if store.respond_to?(plural_model_name)
+ store.send(plural_model_name)
+ else
+ self
+ end
+ end
+
def self.spree_base_scopes
where(nil)
end
diff --git a/core/lib/generators/spree/dummy_model/templates/model.rb.tt b/core/lib/generators/spree/dummy_model/templates/model.rb.tt
index fb0846746e..099ad2c578 100644
--- a/core/lib/generators/spree/dummy_model/templates/model.rb.tt
+++ b/core/lib/generators/spree/dummy_model/templates/model.rb.tt
@@ -1,5 +1,5 @@
module Spree
- class Spree::DummyModel < ApplicationRecord
+ class DummyModel < Spree::Base
acts_as_list
validates :name, presence: true
end