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.

Fixed: added missing page blocks permitted attributes (#12763)

Damian Legawiecbe266780c6df
diff --git a/admin/app/controllers/spree/admin/page_blocks_controller.rb b/admin/app/controllers/spree/admin/page_blocks_controller.rb
index bc58e1b7ea..40bbe06e32 100644
--- a/admin/app/controllers/spree/admin/page_blocks_controller.rb
+++ b/admin/app/controllers/spree/admin/page_blocks_controller.rb
@@ -44,6 +44,12 @@ module Spree
*parent&.available_blocks_to_add
].uniq.sort_by(&:name)
end
+
+ def permitted_resource_params
+ params.require(:page_block).permit(
+ permitted_page_block_attributes + @object.preferences.keys.map { |key| "preferred_#{key}" }
+ )
+ end
end
end
end
diff --git a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb
index 0c0e5d8996..7aa4c73342 100644
--- a/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/page_blocks_controller_spec.rb
@@ -69,6 +69,30 @@ RSpec.describe Spree::Admin::PageBlocksController, type: :controller do
end
end
+ describe '#edit' do
+ subject { get :edit, params: { id: page_block.id, page_section_id: page_section.id } }
+
+ let(:page_block) { create(:page_block, :buttons, section: page_section) }
+ let(:page_section) { create(:featured_taxon_page_section) }
+
+ it 'renders the edit template' do
+ subject
+
+ expect(response).to render_template(:edit)
+ end
+ end
+
+ describe '#update' do
+ subject { put :update, params: { id: page_block.id, page_section_id: page_section.id, page_block: { preferred_button_text_color: '#000000' } }, format: :turbo_stream }
+
+ let(:page_block) { create(:buttons_block, section: page_section) }
+ let(:page_section) { create(:featured_taxon_page_section) }
+
+ it 'updates the page block' do
+ expect { subject }.to change { page_block.reload.preferred_button_text_color }.to('#000000')
+ end
+ end
+
describe '#allowed_types' do
subject { controller.send(:allowed_types) }
diff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rb
index 73fa88114b..2642b6eafb 100644
--- a/core/lib/spree/permitted_attributes.rb
+++ b/core/lib/spree/permitted_attributes.rb
@@ -22,6 +22,7 @@ module Spree
:option_type_attributes,
:option_value_attributes,
:page_attributes,
+ :page_block_attributes,
:page_link_attributes,
:page_section_attributes,
:payment_attributes,
@@ -124,6 +125,8 @@ module Spree
@@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
+ @@page_block_attributes = [:type, :name, :position]
+
@@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
@@page_section_attributes = [:type, :name, :position, :asset]
diff --git a/core/lib/spree/testing_support/factories/page_block_factory.rb b/core/lib/spree/testing_support/factories/page_block_factory.rb
index 1ad6d5b649..871d1a313e 100644
--- a/core/lib/spree/testing_support/factories/page_block_factory.rb
+++ b/core/lib/spree/testing_support/factories/page_block_factory.rb
@@ -16,6 +16,7 @@ FactoryBot.define do
type { 'Spree::PageBlocks::Heading' }
end
+ factory :buttons_block, traits: [:buttons], class: Spree::PageBlocks::Buttons
factory :heading_block, traits: [:heading], class: Spree::PageBlocks::Heading
end
end