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 link to variant when product for that variant is deleted (#12793)

Damian Kaczmarczyka26441333d67
diff --git a/admin/app/controllers/spree/admin/products_controller.rb b/admin/app/controllers/spree/admin/products_controller.rb
index 40e0de7b6a..41bb4b3201 100644
--- a/admin/app/controllers/spree/admin/products_controller.rb
+++ b/admin/app/controllers/spree/admin/products_controller.rb
@@ -152,7 +152,7 @@ module Spree
protected
def find_resource
- current_store.products.accessible_by(current_ability, :manage).with_deleted.friendly.find(params[:id])
+ current_store.products.accessible_by(current_ability, :manage).friendly.find(params[:id])
end
def load_data
diff --git a/admin/app/views/spree/admin/variants/_variant.html.erb b/admin/app/views/spree/admin/variants/_variant.html.erb
index 3fc3842523..130862696e 100644
--- a/admin/app/views/spree/admin/variants/_variant.html.erb
+++ b/admin/app/views/spree/admin/variants/_variant.html.erb
@@ -1,12 +1,12 @@
<% cache variant do %>
- <% if variant.is_master? %>
+ <% if variant.is_master? || variant.product.deleted? %>
<% variant_url = spree.edit_admin_product_path(variant.product) %>
<% else %>
<% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %>
<% end %>
<%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>
- <%= render 'spree/admin/shared/product_image', object: variant %>
+ <%= render "spree/admin/shared/product_image", object: variant %>
<div class="ml-3">
<strong><%= variant.name %></strong>
<% if variant.options_text.present? %>