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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Scope cms_pages by store.
Matthew Kennedycd19255c8eb3
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rbindex 646c0ed8ce..e8f797ca84 100644--- a/backend/app/controllers/spree/admin/cms_pages_controller.rb+++ b/backend/app/controllers/spree/admin/cms_pages_controller.rb@@ -3,11 +3,19 @@ module Spreeclass CmsPagesController < ResourceControllerprivate+ def scope+ current_store.cms_pages+ end++ def find_resource+ scope.find(params[:id])+ end+def collectionreturn @collection if @collection.present?params[:q] ||= {}- @collection = super+ @collection = scope@search = @collection.ransack(params[:q])@collection = @search.result.page(params[:page]).per(params[:per_page])diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erbindex 0d180a8838..a56020da6d 100644--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb@@ -25,9 +25,6 @@</span></div><div class="col-auto d-flex align-items-center">- <span class="badge badge-secondary mx-2">- <%= svg_icon name: "store.svg", width: '18', height: '18' %> <%= @cms_page.store.unique_name %>- </span><span class="badge badge-secondary"><%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %></span>@@ -64,25 +61,19 @@<div class="<% unless %w[new create].include? controller.action_name %>collapse<% end %>" id="cmsPageSettings"><div class="row pb-0"><div class="col-12"><hr></div>- <%= f.field_container :cms_page_stores, class: ['form-group col-6'] do %>- <%= label_tag :cms_page_stores, Spree.t(:stores) %>- <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>- <%= f.error_message_on :cms_page_stores %>- <% end %>-- <%= f.field_container :locale, class: ['form-group col-6'] do %>+ <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %><%= f.label :language %><%= f.select :locale, options_from_collection_for_select(supported_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %><%= f.error_message_on :default_locale %><% end %>- <%= f.field_container :meta_title, class: ['form-group col-6'] do %>+ <%= f.field_container :meta_title, class: ['form-group col-12 col-md-4'] do %><%= f.label :meta_title, Spree.t('admin.cms.meta_title') %><%= f.text_field :meta_title, class: 'form-control' %><%= f.error_message_on :meta_title %><% end %>- <%= f.field_container :slug, class: ['form-group col-6'] do %>+ <%= f.field_container :slug, class: ['form-group col-12 col-md-4'] do %><div id="noHomePage"><%= f.label :slug, Spree.t('slug') %><%= f.text_field :slug, class: 'form-control', disabled: @cms_page.homepage? %>diff --git a/backend/app/views/spree/admin/cms_pages/index.html.erb b/backend/app/views/spree/admin/cms_pages/index.html.erbindex 2437a538bc..bffbada9cb 100644--- a/backend/app/views/spree/admin/cms_pages/index.html.erb+++ b/backend/app/views/spree/admin/cms_pages/index.html.erb@@ -47,7 +47,6 @@<th scope="col"><%= Spree.t('admin.cms.title') %></th><th scope="col"><%= Spree.t('admin.cms.visible') %></th><th scope="col"><%= Spree.t('admin.cms.page_type') %></th>- <th scope="col"><%= Spree.t('store') %></th><th scope="col"><%= Spree.t('language') %></th><th scope="col"></th></thead>@@ -63,9 +62,6 @@<td><%= spree_humanize_type(page.type) %></td>- <td>- <%= page.store.unique_name %>- </td><td><%= locale_full_name(page.locale) %></td>diff --git a/backend/spec/features/admin/cms_pages/new_page_spec.rb b/backend/spec/features/admin/cms_pages/new_page_spec.rbindex c0f687fbeb..9a48ee8b5e 100644--- a/backend/spec/features/admin/cms_pages/new_page_spec.rb+++ b/backend/spec/features/admin/cms_pages/new_page_spec.rb@@ -44,7 +44,6 @@ describe 'New Page', type: :feature doit 'warns the user that the slug has already been taken', js: true dofill_in 'Title *', with: 'About Us'- select2 store_1.unique_name, from: 'Stores'click_on 'Create'expect(page).to have_text ('Slug has already been taken')