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.

Allow for more pages to be added as links in page builder (#13065)

Damian Legawiec0bfa9de94248
diff --git a/admin/app/helpers/spree/admin/page_builder_helper.rb b/admin/app/helpers/spree/admin/page_builder_helper.rb
index 566bca67fa..e082f6d216 100644
--- a/admin/app/helpers/spree/admin/page_builder_helper.rb
+++ b/admin/app/helpers/spree/admin/page_builder_helper.rb
@@ -81,10 +81,10 @@ module Spree
def all_linkable_pages
@all_linkable_pages ||= Spree::Page.
- linkable.
without_previews.
where(pageable: [@theme, current_store]).
- map { |page| [page.display_name, page.id] }
+ select(&:linkable?).
+ map { |page| [page.display_name, page.id] }.sort_by(&:first)
end
def all_linkable_policies
diff --git a/core/app/models/spree/page.rb b/core/app/models/spree/page.rb
index 001582b7d5..44fc4c306e 100644
--- a/core/app/models/spree/page.rb
+++ b/core/app/models/spree/page.rb
@@ -103,6 +103,10 @@ module Spree
false
end
+ def linkable?
+ false
+ end
+
def layout_sections?
true
end
diff --git a/core/app/models/spree/pages/account.rb b/core/app/models/spree/pages/account.rb
index 9cc7ab4398..358271db1e 100644
--- a/core/app/models/spree/pages/account.rb
+++ b/core/app/models/spree/pages/account.rb
@@ -10,6 +10,10 @@ module Spree
def icon_name
'user'
end
+
+ def linkable?
+ true
+ end
end
end
end
diff --git a/core/app/models/spree/pages/cart.rb b/core/app/models/spree/pages/cart.rb
index b1bbbe09a1..ad177a8083 100644
--- a/core/app/models/spree/pages/cart.rb
+++ b/core/app/models/spree/pages/cart.rb
@@ -4,6 +4,10 @@ module Spree
def icon_name
'shopping-cart'
end
+
+ def linkable?
+ true
+ end
end
end
end
diff --git a/core/app/models/spree/pages/custom.rb b/core/app/models/spree/pages/custom.rb
index 60a803a7d5..c3d432fc59 100644
--- a/core/app/models/spree/pages/custom.rb
+++ b/core/app/models/spree/pages/custom.rb
@@ -5,6 +5,10 @@ module Spree
true
end
+ def linkable?
+ true
+ end
+
def page_builder_url
return unless page_builder_url_exists?(:page_path)
diff --git a/core/app/models/spree/pages/homepage.rb b/core/app/models/spree/pages/homepage.rb
index d04db74592..7a8b9d09a0 100644
--- a/core/app/models/spree/pages/homepage.rb
+++ b/core/app/models/spree/pages/homepage.rb
@@ -11,6 +11,10 @@ module Spree
'home'
end
+ def linkable?
+ true
+ end
+
def default_sections
sections = [
Spree::PageSections::ImageWithText.new(
diff --git a/core/app/models/spree/pages/login.rb b/core/app/models/spree/pages/login.rb
index 7036c37066..9535b2ba4e 100644
--- a/core/app/models/spree/pages/login.rb
+++ b/core/app/models/spree/pages/login.rb
@@ -10,6 +10,10 @@ module Spree
Spree::Core::Engine.routes.url_helpers.login_path
end
+
+ def linkable?
+ true
+ end
end
end
end
diff --git a/core/app/models/spree/pages/post_list.rb b/core/app/models/spree/pages/post_list.rb
index 184619096f..b21613e197 100644
--- a/core/app/models/spree/pages/post_list.rb
+++ b/core/app/models/spree/pages/post_list.rb
@@ -27,6 +27,10 @@ module Spree
def customizable?
true
end
+
+ def linkable?
+ true
+ end
end
end
end
diff --git a/core/app/models/spree/pages/shop_all.rb b/core/app/models/spree/pages/shop_all.rb
index 01b816875a..8a2f73a2f7 100644
--- a/core/app/models/spree/pages/shop_all.rb
+++ b/core/app/models/spree/pages/shop_all.rb
@@ -31,6 +31,10 @@ module Spree
def customizable?
true
end
+
+ def linkable?
+ true
+ end
end
end
end
diff --git a/core/app/models/spree/pages/wishlist.rb b/core/app/models/spree/pages/wishlist.rb
index c3ba8546f5..3f226424f0 100644
--- a/core/app/models/spree/pages/wishlist.rb
+++ b/core/app/models/spree/pages/wishlist.rb
@@ -6,6 +6,10 @@ module Spree
Spree::Core::Engine.routes.url_helpers.account_wishlist_path
end
+
+ def linkable?
+ true
+ end
end
end
end