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.

Revert "Allow configuring the validation scope for the Spree::UniqueName" (#13300)

Damian Legawiecbfc3d5d8f1c2
diff --git a/core/app/models/concerns/spree/unique_name.rb b/core/app/models/concerns/spree/unique_name.rb
index ee7fa47424..2bef95acb7 100644
--- a/core/app/models/concerns/spree/unique_name.rb
+++ b/core/app/models/concerns/spree/unique_name.rb
@@ -6,7 +6,7 @@ module Spree
auto_strip_attributes :name
validates :name, presence: true,
- uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope(attribute: :name) }
+ uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
end
end
end
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb
index 1fd37df7fe..0102cea743 100644
--- a/core/app/models/spree/base.rb
+++ b/core/app/models/spree/base.rb
@@ -40,8 +40,8 @@ class Spree::Base < ApplicationRecord
where(nil)
end
- def self.spree_base_uniqueness_scope(attribute: nil)
- Spree.uniqueness_scopes.dig(name.demodulize.underscore, attribute) || ApplicationRecord.try(:spree_base_uniqueness_scope) || []
+ def self.spree_base_uniqueness_scope
+ ApplicationRecord.try(:spree_base_uniqueness_scope) || []
end
# FIXME: https://github.com/rails/rails/issues/40943
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 56a5e49940..47d7092a5e 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -138,10 +138,6 @@ module Spree
Spree::Config.always_use_translations || I18n.default_locale != I18n.locale
end
- def self.uniqueness_scopes
- @@uniqueness_scopes ||= ActiveSupport::HashWithIndifferentAccess.new
- end
-
# Used to configure Spree.
#
# Example: