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 Rails 8.1 ActiveRecord::EagerLoadPolymorphicError (#13504)

Damian Legawiec2aef3c376de8
diff --git a/page_builder/app/jobs/spree/themes/duplicate_components_job.rb b/page_builder/app/jobs/spree/themes/duplicate_components_job.rb
index f82c30cf49..5dc12f33a8 100644
--- a/page_builder/app/jobs/spree/themes/duplicate_components_job.rb
+++ b/page_builder/app/jobs/spree/themes/duplicate_components_job.rb
@@ -43,7 +43,7 @@ module Spree
all_parent_ids = all_section_ids + all_page_blocks.ids
all_page_links = Spree::PageLink.
- includes(:linkable, parent: :pageable).
+ preload(:linkable, parent: :pageable).
where(linkable_type: 'Spree::Page').
where(parent_id: all_parent_ids, linkable_id: theme.pages)
diff --git a/page_builder/app/models/concerns/spree/has_page_links.rb b/page_builder/app/models/concerns/spree/has_page_links.rb
index a7cce76bfe..48add639d4 100644
--- a/page_builder/app/models/concerns/spree/has_page_links.rb
+++ b/page_builder/app/models/concerns/spree/has_page_links.rb
@@ -3,7 +3,7 @@ module Spree
extend ActiveSupport::Concern
included do
- has_many :links, -> { order(:position).includes(:linkable) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent
+ has_many :links, -> { order(:position) }, class_name: 'Spree::PageLink', as: :parent, dependent: :destroy, inverse_of: :parent
alias page_links links
after_create :create_default_links, unless: :do_not_create_links