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.

Scope Pages by store, fix API.

Matthew Kennedy32c1f5bb1956
diff --git a/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
index 45620fa818..f42888a611 100644
--- a/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/cms_pages_spec.rb
@@ -4,7 +4,7 @@ describe 'Platform API v2 CmsPages', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let(:store) { create(:store, default: true) }
+ let(:store) { Spree::Store.default }
let(:page) { create(:cms_homepage, store: store) }
let(:bearer_token) { { 'Authorization' => valid_authorization } }
diff --git a/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
index 06e20420bc..7e3adb2c9f 100644
--- a/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/cms_sections_spec.rb
@@ -4,7 +4,7 @@ describe 'Platform API v2 CmsSections', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let(:store) { create(:store, default: true) }
+ let(:store) { Spree::Store.default }
let(:page) { create(:cms_homepage, store: store) }
let(:section_a) { create(:cms_section, cms_page: page) }
let(:section_b) { create(:cms_section, cms_page: page) }
diff --git a/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb b/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
index c2807cb29d..497a530b94 100644
--- a/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
+++ b/api/spec/requests/spree/api/v2/platform/menu_items_spec.rb
@@ -4,7 +4,7 @@ describe 'Platform API v2 MenuItems', type: :request do
include_context 'API v2 tokens'
include_context 'Platform API v2'
- let(:store) { create(:store, default: true) }
+ let(:store) { Spree::Store.default }
let(:menu) { create(:menu, store: store) }
let!(:menu_item_a) { create(:menu_item, menu: menu) }
let!(:menu_item_b) { create(:menu_item, menu: menu) }
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
index 681d380ca6..ee7140d806 100644
--- a/backend/app/assets/javascripts/spree/backend.js
+++ b/backend/app/assets/javascripts/spree/backend.js
@@ -44,7 +44,6 @@
//= require spree/backend/promotions
//= require spree/backend/cms/_index
//= require spree/backend/menus/_index
-//= require spree/backend/cms/_index
//= require spree/backend/returns/expedited_exchanges_warning
//= require spree/backend/returns/return_item_selection
//= require spree/backend/shipments
diff --git a/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss b/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
index 2ce6d932f4..97cd7656fa 100644
--- a/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
+++ b/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
@@ -31,6 +31,7 @@
@import 'shared/forms';
@import 'views/menus';
+@import 'views/cms_pages';
@import 'views/order_payments';
@import 'views/product_properties';
@import 'views/prototypes';
diff --git a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
index 2c2ffc070c..1c1baa1f9c 100644
--- a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
+++ b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
@@ -9,7 +9,6 @@
}
}
-
#standardPage {
.sp-pb-0 {
padding-bottom: 0 !important;
diff --git a/backend/app/controllers/spree/admin/cms_pages_controller.rb b/backend/app/controllers/spree/admin/cms_pages_controller.rb
index 646c0ed8ce..4426d12df7 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 = super
+ @collection = scope
@search = @collection.ransack(params[:q])
@collection = @search.result.page(params[:page]).per(params[:per_page])
@@ -16,6 +16,14 @@ 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/backend/app/views/spree/admin/cms_pages/index.html.erb b/backend/app/views/spree/admin/cms_pages/index.html.erb
index d9bb97461e..2437a538bc 100644
--- a/backend/app/views/spree/admin/cms_pages/index.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/index.html.erb
@@ -11,34 +11,26 @@
<%= search_form_for [:admin, @search] do |f| %>
<%- locals = {f: f} %>
<div class="row">
- <div class="col-12 col-lg-6">
+ <div class="col-12 col-lg-4">
<div class="form-group">
<%= f.label :title_cont, Spree.t('admin.cms.title') %>
<%= f.text_field :title_cont, size: 15, class: "form-control js-quick-search-target js-filterable" %>
</div>
</div>
- <div class="col-12 col-lg-6">
+ <div class="col-12 col-lg-4">
<div class="form-group">
<%= label_tag :q_type_eq, Spree.t(:type) %>
<%= f.select(:type_eq, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: true}, class: 'select2-clear js-filterable') %>
</div>
</div>
- </div>
- <div class="row">
- <div class="col-12 col-lg-6">
+ <div class="col-12 col-lg-4">
<div class="form-group">
<%= label_tag :q_locale_eq, Spree.t(:language) %>
<%= f.select :locale_eq, all_locales_options, { include_blank: true }, class: 'select2-clear js-filterable' %>
</div>
</div>
- <div class="col-12 col-lg-6">
- <div class="form-group">
- <%= label_tag :q_store_id_in, Spree.t(:store) %>
- <%= f.collection_select(:store_id_in, @stores, :id, :unique_name, { include_blank: true }, { class: 'select2-clear js-filterable' }) %>
- </div>
- </div>
</div>
<div data-hook="admin_menus_index_search_buttons" class="form-actions">