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
handle custom model class in exports#new (#13656)
Kacper Mękarski03dc7d75bd45
diff --git a/spree/admin/app/controllers/spree/admin/exports_controller.rb b/spree/admin/app/controllers/spree/admin/exports_controller.rbindex e112b65317..3eea4e3d94 100644--- a/spree/admin/app/controllers/spree/admin/exports_controller.rb+++ b/spree/admin/app/controllers/spree/admin/exports_controller.rb@@ -35,7 +35,8 @@ module Spreeenddef assign_params- @object.type = permitted_resource_params[:type] if available_types.map(&:to_s).include?(permitted_resource_params[:type])+ available_type = available_types.map(&:to_s).find { |t| t == permitted_resource_params[:type] }+ @object = @object.becomes!(available_type.constantize) if available_type.present?@object.search_params = permitted_resource_params[:search_params]enddiff --git a/spree/admin/app/views/spree/admin/exports/create.turbo_stream.erb b/spree/admin/app/views/spree/admin/exports/create.turbo_stream.erbindex a453398170..02b9da28f9 100644--- a/spree/admin/app/views/spree/admin/exports/create.turbo_stream.erb+++ b/spree/admin/app/views/spree/admin/exports/create.turbo_stream.erb@@ -1,5 +1,5 @@<%= turbo_render_alerts %><%= turbo_stream.replace 'export-dialog' do %>- <%= render 'spree/admin/shared/export_modal', export_type: @export.type %>+ <%= render 'spree/admin/shared/export_modal', export_type: @object.type %><% end %>diff --git a/spree/admin/app/views/spree/admin/exports/new.html.erb b/spree/admin/app/views/spree/admin/exports/new.html.erbindex 4ebb7b54a2..ca82015983 100644--- a/spree/admin/app/views/spree/admin/exports/new.html.erb+++ b/spree/admin/app/views/spree/admin/exports/new.html.erb@@ -1,15 +1,15 @@<%= turbo_frame_tag :export_dialog do %>- <%= form_for @export, url: spree.admin_exports_path do |f| %>+ <%= form_for @object, url: spree.admin_exports_path, as: :export do |f| %><%= f.hidden_field :type %><%= f.hidden_field :search_params %><div class="dialog-header"><h5 class="dialog-title">- <%= Spree.t(:export) + ' ' + plural_resource_name(@export.model_class) %>+ <%= Spree.t(:export) + ' ' + plural_resource_name(@object.model_class) %></h5><button type="button" class="btn-close" data-action="click->export-dialog#close" aria-label="Close"></button></div><div class="dialog-body">- <%= render 'spree/admin/shared/error_messages', target: @export %>+ <%= render 'spree/admin/shared/error_messages', target: @object %><div class="custom-control custom-radio hover:bg-gray-50 rounded-lg p-3"><%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %><%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label flex-col items-start' do %>diff --git a/spree/admin/spec/controllers/spree/admin/exports_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/exports_controller_spec.rbindex aa10a7e4a0..449735d732 100644--- a/spree/admin/spec/controllers/spree/admin/exports_controller_spec.rb+++ b/spree/admin/spec/controllers/spree/admin/exports_controller_spec.rb@@ -32,8 +32,9 @@ describe Spree::Admin::ExportsController, type: :controller doit 'assigns permitted params' dosubject- expect(assigns(:export).type).to eq('Spree::Exports::Products')- expect(assigns(:export).search_params).to eq({ 'name_cont' => 'Product' }.to_json)+ expect(assigns(:object)).to be_an_instance_of(Spree::Exports::Products)+ expect(assigns(:object).type).to eq('Spree::Exports::Products')+ expect(assigns(:object).search_params).to eq({ 'name_cont' => 'Product' }.to_json)endend@@ -72,7 +73,7 @@ describe Spree::Admin::ExportsController, type: :controller doit 'does not assign search_params' dosubject- expect(assigns(:export).search_params).to be_nil+ expect(assigns(:object).search_params).to be_nilendendend