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.

Fix initializing the color picker, hide Taxon List page in the page builder (#12356)

Łukasz Adamczyk09b6a2ca21e0
diff --git a/admin/app/javascript/spree/admin/controllers/color_picker_controller.js b/admin/app/javascript/spree/admin/controllers/color_picker_controller.js
index 4e1aca13e2..eb97201d18 100644
--- a/admin/app/javascript/spree/admin/controllers/color_picker_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/color_picker_controller.js
@@ -13,7 +13,7 @@ export default class extends Controller {
this.picker = Pickr.create({
el: this.pickerTarget,
theme: 'classic',
- default: this.inputTarget.value.length > 0 ? this.inputTargetValue : this.defaultColorValue,
+ default: this.inputTarget.value.length > 0 ? this.inputTarget.value : this.defaultColorValue,
useAsButton: true,
components: {
diff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rb
index 8e4fb44243..80b54fbf9d 100644
--- a/core/app/models/spree/page.rb
+++ b/core/app/models/spree/page.rb
@@ -36,7 +36,6 @@ module Spree
where(type: [
'Spree::Pages::Homepage',
'Spree::Pages::ShopAll',
- 'Spree::Pages::TaxonList',
'Spree::Pages::PostList',
'Spree::Pages::Custom',
'Spree::Pages::Account',
diff --git a/core/app/models/spree/page_sections/footer.rb b/core/app/models/spree/page_sections/footer.rb
index 194f7d0b6e..9370c2b1e9 100644
--- a/core/app/models/spree/page_sections/footer.rb
+++ b/core/app/models/spree/page_sections/footer.rb
@@ -35,9 +35,6 @@ module Spree
shop_default_links = [
Spree::PageLink.new(
linkable: pages.find_by(type: 'Spree::Pages::ShopAll')
- ),
- Spree::PageLink.new(
- linkable: pages.find_by(type: 'Spree::Pages::TaxonList')
)
]
diff --git a/core/app/models/spree/page_sections/header.rb b/core/app/models/spree/page_sections/header.rb
index ddcabb410c..391083b1c7 100644
--- a/core/app/models/spree/page_sections/header.rb
+++ b/core/app/models/spree/page_sections/header.rb
@@ -36,8 +36,7 @@ module Spree
def default_links
links = [
- Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::ShopAll')),
- Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::TaxonList'))
+ Spree::PageLink.new(linkable: pages.find_by(type: 'Spree::Pages::ShopAll'))
]
collections_taxonomy = store.taxonomies.find_by(name: Spree.t(:taxonomy_collections_name))
diff --git a/core/app/models/spree/pages/taxon_list.rb b/core/app/models/spree/pages/taxon_list.rb
index 054972f337..15be2af2d5 100644
--- a/core/app/models/spree/pages/taxon_list.rb
+++ b/core/app/models/spree/pages/taxon_list.rb
@@ -21,7 +21,7 @@ module Spree
end
def customizable?
- true
+ false
end
def display_name