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.

Add link to CMS

Matthew Kennedy55e9bc371d1d
diff --git a/backend/app/assets/javascripts/spree/backend/global/tinymce.es6 b/backend/app/assets/javascripts/spree/backend/global/tinymce.es6
index 64e5fe55c8..a579291d2e 100644
--- a/backend/app/assets/javascripts/spree/backend/global/tinymce.es6
+++ b/backend/app/assets/javascripts/spree/backend/global/tinymce.es6
@@ -3,9 +3,9 @@ document.addEventListener('DOMContentLoaded', function() {
tinymce.init({
selector: '.spree-rte',
plugins: [
- 'image table paste code'
+ 'image table paste code link'
],
menubar: false,
- toolbar: 'undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | code '
+ toolbar: 'undo redo | styleselect | bold italic link | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | code '
});
})
diff --git a/frontend/app/views/spree/shared/_carousel_4_products.html.erb b/frontend/app/views/spree/shared/_carousel_4_products.html.erb
index 0ab75af08e..bd084adb3a 100644
--- a/frontend/app/views/spree/shared/_carousel_4_products.html.erb
+++ b/frontend/app/views/spree/shared/_carousel_4_products.html.erb
@@ -1,4 +1,4 @@
-<% cache [common_product_cache_keys, products&.pluck(:updated_at)&.last&.to_i, id, products&.ids&.join(',')] do %>
+<% cache [common_product_cache_keys, products&.except(:group, :order)&.maximum(:updated_at)&.to_i, id, products&.ids&.join(',')] do %>
<div id="<%= id %>-mobile" class="carousel slide d-md-none homepage-carousel" data-interval="false">
<div class="carousel-inner">
<% products.each_slice(2).with_index do |sliced_items, index| %>