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 Taxons/Classifications URL generation in admin

Damian Legawiec19133c4651ca
diff --git a/admin/app/views/spree/admin/classifications/_classification.html.erb b/admin/app/views/spree/admin/classifications/_classification.html.erb
index e003887f2d..78527545d7 100644
--- a/admin/app/views/spree/admin/classifications/_classification.html.erb
+++ b/admin/app/views/spree/admin/classifications/_classification.html.erb
@@ -1,4 +1,4 @@
-<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>">
+<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon, classification, format: :turbo_stream) %>">
<% if classification.taxon.manual_sort_order? %>
<div class="col-span-1 text-center self-center">
<span class="rounded-md p-2 hover:bg-gray-100 move-handle cursor-grab">
@@ -31,7 +31,7 @@
</div>
<div class="col-span-2 text-center self-center">
- <%= button_to spree.admin_taxon_classification_path(classification.taxon_id, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %>
+ <%= button_to spree.admin_taxon_classification_path(classification.taxon, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %>
<%= icon 'trash', class: 'mr-0', style: 'pointer-events: none' %>
<%= tooltip(Spree.t('actions.destroy')) %>
<% end if classification.taxon.manual? && can?(:delete, classification) %>
diff --git a/admin/app/views/spree/admin/classifications/index.html.erb b/admin/app/views/spree/admin/classifications/index.html.erb
index 6fcb267fa7..f6d0aa9186 100644
--- a/admin/app/views/spree/admin/classifications/index.html.erb
+++ b/admin/app/views/spree/admin/classifications/index.html.erb
@@ -14,7 +14,7 @@
</p>
<p class="text-center">
<% if can?(:create, Spree::Classification) && @taxon.manual? %>
- <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-secondary', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+ <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon), class: 'btn btn-secondary', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
<% end %>
<% end %>
<% end %>
diff --git a/admin/app/views/spree/admin/classifications/new.html.erb b/admin/app/views/spree/admin/classifications/new.html.erb
index a680aff0b8..a7d4e18013 100644
--- a/admin/app/views/spree/admin/classifications/new.html.erb
+++ b/admin/app/views/spree/admin/classifications/new.html.erb
@@ -1 +1 @@
-<%= render 'spree/admin/shared/multi_product_picker', parent: @parent, url: spree.admin_taxon_classifications_path(@parent.id) %>
\ No newline at end of file
+<%= render 'spree/admin/shared/multi_product_picker', parent: @parent, url: spree.admin_taxon_classifications_path(@parent) %>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/taxons/_form.html.erb b/admin/app/views/spree/admin/taxons/_form.html.erb
index f0c45c5345..d4d0281cf0 100644
--- a/admin/app/views/spree/admin/taxons/_form.html.erb
+++ b/admin/app/views/spree/admin/taxons/_form.html.erb
@@ -54,7 +54,7 @@
</h5>
<% if @taxon.manual? && can?(:create, Spree::Classification) %>
- <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
+ <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
<% end %>
</div>
@@ -67,7 +67,7 @@
<div class="card-body min-h-[300px] p-0">
<div class="block overflow-y-auto overflow-x-hidden max-h-[300px]">
- <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id), loading: :lazy do %>
+ <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon), loading: :lazy do %>
<%= render 'spree/admin/shared/spinner' %>
<% end %>
</div>
diff --git a/admin/app/views/spree/admin/taxons/update.turbo_stream.erb b/admin/app/views/spree/admin/taxons/update.turbo_stream.erb
index 9d3f71f185..23971cedf9 100644
--- a/admin/app/views/spree/admin/taxons/update.turbo_stream.erb
+++ b/admin/app/views/spree/admin/taxons/update.turbo_stream.erb
@@ -1,7 +1,7 @@
<%= turbo_render_alerts %>
<%= turbo_stream.replace :classifications do %>
- <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id) do %>
+ <%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon) do %>
<%= render 'spree/admin/shared/spinner' %>
<% end %>
<% end %>