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 issues from merging master + some code review fixes.

Matthew Kennedy6b77a8da3976
diff --git a/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb b/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb
index e2dbb713c2..a66e7454b2 100644
--- a/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/cms_pages_controller.rb
@@ -10,7 +10,7 @@ module Spree
end
def resource
- @resource ||= scope.find_by(slug: params[:slug])
+ @resource ||= scope.friendly.find(params[:slug])
end
def resource_serializer
@@ -22,7 +22,7 @@ module Spree
end
def scope
- super.by_store(current_store).by_locale(I18n.locale).linkable
+ super.by_locale(I18n.locale).linkable
end
end
end
diff --git a/api/config/routes.rb b/api/config/routes.rb
index 80f2287d0b..89964240e8 100644
--- a/api/config/routes.rb
+++ b/api/config/routes.rb
@@ -168,7 +168,7 @@ Spree::Core::Engine.add_routes do
get '/menus/:location', to: 'menus#show', as: :menu
resources :cms_pages, only: %i[index], path: '/pages'
- get '/pages/:slug', to: 'cms_pages#show', as: :page
+ get '/cms_pages/:slug', to: 'cms_pages#show', as: :page
end
namespace :platform do
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rb
index 4426d12df7..646c0ed8ce 100644
--- a/backend/app/controllers/spree/admin/cms_pages_controller.rb
+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb
@@ -7,7 +7,7 @@ module Spree
return @collection if @collection.present?
params[:q] ||= {}
- @collection = scope
+ @collection = super
@search = @collection.ransack(params[:q])
@collection = @search.result.page(params[:page]).per(params[:per_page])
@@ -16,14 +16,6 @@ module Spree
def location_after_save
spree.edit_admin_cms_page_path(@cms_page)
end
-
- def scope
- current_store.cms_pages
- end
-
- def find_resource
- scope.find(params[:id])
- end
end
end
end
diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rb
index c06c804ce9..297ae65e83 100644
--- a/core/app/models/spree/cms_page.rb
+++ b/core/app/models/spree/cms_page.rb
@@ -1,5 +1,6 @@
module Spree
class CmsPage < Spree::Base
+ include SingleStoreResource
include Spree::DisplayLink
TYPES = ['Spree::Cms::Pages::StandardPage',
@@ -17,7 +18,6 @@ module Spree
validates :slug, uniqueness: { scope: :store, allow_nil: true, case_sensitive: true }
scope :visible, -> { where(visible: true) }
- scope :by_store, ->(store) { where(store: store) }
scope :by_locale, ->(locale) { where(locale: locale) }
scope :by_slug, ->(slug) { where(slug: slug) }
scope :linkable, -> { where.not(slug: nil, type: 'Spree::Cms::Pages::Homepage') }
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 5ed5e73d31..ed35135727 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -97,6 +97,22 @@ module Spree
end.uniq.compact
end
+ def homepage(requested_locale)
+ Spree::CmsPage.find_by(store_id: id, locale: requested_locale, type: 'Spree::Cms::Pages::Homepage') ||
+ Spree::CmsPage.find_by(store_id: id, locale: default_locale, type: 'Spree::Cms::Pages::Homepage') ||
+ Spree::CmsPage.find_by(store_id: id, type: 'Spree::Cms::Pages::Homepage')
+ end
+
+ def seo_meta_description
+ if meta_description.present?
+ meta_description
+ elsif seo_title.present?
+ seo_title
+ else
+ name
+ end
+ end
+
def supported_locales_list
# TODO: add support of multiple supported languages to a single Store
@supported_locales_list ||= (read_attribute(:supported_locales).to_s.split(',') << default_locale).compact.uniq.sort
diff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rb
index 8eceeb4c60..0c7687b7c8 100644
--- a/frontend/app/controllers/spree/cms_pages_controller.rb
+++ b/frontend/app/controllers/spree/cms_pages_controller.rb
@@ -23,7 +23,7 @@ module Spree
end
def load_cms_page
- @page = Spree::CmsPage.by_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
+ @page = Spree::CmsPage.for_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
end
end
end