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 translations form turbo frame (#12309)

Damian Kaczmarczyke2fa4ba84a8e
diff --git a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb
index 1be66f7898..c2849196fa 100644
--- a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb
+++ b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb
@@ -1,5 +1,5 @@
<%= turbo_stream.update :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_billing_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb b/admin/app/views/spree/admin/orders/billing_address/edit.html.erb
index 44464be5c1..0b39c7c71c 100644
--- a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb
+++ b/admin/app/views/spree/admin/orders/billing_address/edit.html.erb
@@ -1,5 +1,5 @@
<%= turbo_frame_tag :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/billing_address/new.html.erb b/admin/app/views/spree/admin/orders/billing_address/new.html.erb
index e2e1a3c5a1..5337c0e37b 100644
--- a/admin/app/views/spree/admin/orders/billing_address/new.html.erb
+++ b/admin/app/views/spree/admin/orders/billing_address/new.html.erb
@@ -1,5 +1,5 @@
<%= turbo_frame_tag :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb
index 0f946fd525..26f5e1ad02 100644
--- a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb
+++ b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb
@@ -1,5 +1,5 @@
<%= turbo_stream.update :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_billing_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb
index 45ce5b2a31..9d68848231 100644
--- a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb
+++ b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb
@@ -1,5 +1,5 @@
<%= turbo_frame_tag :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb
index d366b243de..0f89471a8a 100644
--- a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb
+++ b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb
@@ -1,5 +1,5 @@
<%= turbo_stream.update :dialog_modal do %>
- <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'form', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
+ <%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_shipping_address) %></h5>
diff --git a/admin/app/views/spree/admin/orders/user/new.html.erb b/admin/app/views/spree/admin/orders/user/new.html.erb
index f50350eb28..3d20e81d91 100644
--- a/admin/app/views/spree/admin/orders/user/new.html.erb
+++ b/admin/app/views/spree/admin/orders/user/new.html.erb
@@ -18,9 +18,9 @@
<% end %>
<% else %>
<div class="d-flex gap-2 flex-column">
- <%= form_with url: spree.admin_order_user_path(@order), data: { controller: 'form', form_target: 'form' }, method: :patch do %>
+ <%= form_with url: spree.admin_order_user_path(@order), data: { controller: 'auto-submit' }, method: :patch do %>
<%= label_tag :user_id, Spree.t(:select_user), class: "sr-only" %>
- <%= tom_select_tag :user_id, { include_blank: Spree.t(:select_user), options: users_for_select_options, select_data: {action: 'form#submit'}, disable_with: "<span class='spinner-border spinner-border-sm' role='status'></span>" } %>
+ <%= tom_select_tag :user_id, { include_blank: Spree.t(:select_user), options: users_for_select_options, select_data: {action: 'auto-submit#submit'}, disable_with: "<span class='spinner-border spinner-border-sm' role='status'></span>" } %>
<% end %>
<span class="d-flex w-100 justify-content-center align-items-center"><%= Spree.t(:or) %></span>
<%= link_to Spree.t(:create_new), spree.new_admin_order_user_path(@order, show_form: true), class: "btn btn-light w-100" %>
diff --git a/admin/app/views/spree/admin/translations/edit.html.erb b/admin/app/views/spree/admin/translations/edit.html.erb
index f359c4f732..3539c2c9f9 100644
--- a/admin/app/views/spree/admin/translations/edit.html.erb
+++ b/admin/app/views/spree/admin/translations/edit.html.erb
@@ -12,8 +12,8 @@
<% end %>
<% end %>
<%= form_with url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
- <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
<%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
+ <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
<table class="table">
<thead class="text-muted">
<tr>