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 controller for fronted.

Matthew Kennedy3b9b88ab4a77
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index d514e7d388..5c579ae8e1 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -9,13 +9,14 @@ module Spree
has_many :cms_sections
has_many :menu_items, as: :linked_resource
- before_save :create_slug
+ before_validation :create_slug
validates :title, presence: true
-
+ validates :slug, uniqueness: true
validates :kind, uniqueness: { scope: [:store, :locale] }, if: :home_page?
scope :visible, -> { where visible: true }
+ scope :by_store, ->(store) { where(store: store) }
def seo_title
if meta_title.present?
@@ -25,6 +26,10 @@ module Spree
end
end
+ def self.by_localized_slug(slug, locale)
+ find_by(slug: slug, locale: locale.to_s) || store.default_page
+ end
+
private
def home_page?
diff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rb
index 32307d070f..e3c4dd324e 100644
--- a/frontend/app/controllers/spree/cms_pages_controller.rb
+++ b/frontend/app/controllers/spree/cms_pages_controller.rb
@@ -2,14 +2,23 @@ module Spree
class CmsPagesController < Spree::StoreController
before_action :load_cms_page, only: [:show]
- def show
- @title = @cms_page.seo_title
- end
+ include Spree::FrontendHelper
+ include Spree::CacheHelper
+
+ def show; end
private
+ def accurate_title
+ if @cms_page
+ @cms_page.seo_title
+ else
+ super
+ end
+ end
+
def load_cms_page
- @cms_page = available_pages.visible.friendly.find(params[:id])
+ @cms_page = Spree::CmsPage.visible.by_store(current_store).friendly.find(params[:id])
end
end
end