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
Improve asset type handling in `Admin::AssetsController`
Damian Legawiecb420b5cbf188
diff --git a/admin/app/controllers/spree/admin/assets_controller.rb b/admin/app/controllers/spree/admin/assets_controller.rbindex 10319abcac..d92fc825ca 100644--- a/admin/app/controllers/spree/admin/assets_controller.rb+++ b/admin/app/controllers/spree/admin/assets_controller.rb@@ -3,14 +3,8 @@ module Spreeclass AssetsController < ResourceControllerinclude Spree::Admin::SessionAssetsHelper- ALLOWED_ASSET_TYPES = ['Spree::Asset', 'Spree::Image'].freeze-def create- if ALLOWED_ASSET_TYPES.include?(asset_type)- @asset = asset_type.constantize.new(permitted_resource_params)- else- raise "Invalid asset type"- end+ @asset = asset_type.new(permitted_resource_params)# we only should check this for vendor usersauthorize! :update, @asset.viewable if @asset.viewable.present? && current_vendor@@ -47,7 +41,7 @@ module Spreeprivatedef permitted_resource_params- params.require(:asset).permit(:type, :viewable_id, :viewable_type, :attachment, :alt, :position)+ params.require(:asset).permit(Spree::PermittedAttributes.asset_attributes)enddef create_turbo_stream_enabled?@@ -63,7 +57,11 @@ module Spreeenddef asset_type- permitted_resource_params[:type] || model_class.to_s+ allowed_asset_types.find { |type| type.to_s == permitted_resource_params[:type] } || model_class+ end++ def allowed_asset_types+ [Spree::Asset, Spree::Image]endendenddiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex c1952f06b0..ead3298de2 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -2,6 +2,7 @@ module Spreemodule PermittedAttributesATTRIBUTES = [:address_attributes,+ :asset_attributes,:checkout_attributes,:classification_attributes,:cms_page_attributes,@@ -47,6 +48,8 @@ module Spreestate: [:name, :abbr] }]+ @@asset_attributes = [:type, :viewable_id, :viewable_type, :attachment, :alt, :position]+@@checkout_attributes = [:coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,:user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account