From bec2a873decb51260df67d661a0aff9ba4e0c6e8 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 10 Jun 2022 15:32:58 +1000 Subject: [PATCH] Show order and admin page despite broken image Avoiding: ActiveStorage::InvariableError Affects the admin order page and the customer's order confirmation page. --- app/views/spree/shared/_variant_thumbnail.html.haml | 7 +------ spec/views/spree/orders/show.html.haml_spec.rb | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/views/spree/shared/_variant_thumbnail.html.haml b/app/views/spree/shared/_variant_thumbnail.html.haml index d92e205a0b..12c2589984 100644 --- a/app/views/spree/shared/_variant_thumbnail.html.haml +++ b/app/views/spree/shared/_variant_thumbnail.html.haml @@ -1,6 +1 @@ -- if variant.product.images.length == 0 - = image_tag("/noimage/mini.png") -- else - - # A Rails bug makes it necessary to call `main_app.url_for` here. - - # https://github.com/rails/rails/issues/31325 - = image_tag(main_app.url_for(variant.product.images.first.variant(:mini))) += image_tag(variant.product.images.first&.url(:mini) || "/noimage/mini.png") diff --git a/spec/views/spree/orders/show.html.haml_spec.rb b/spec/views/spree/orders/show.html.haml_spec.rb index 48bed635d6..1b9a2882cf 100644 --- a/spec/views/spree/orders/show.html.haml_spec.rb +++ b/spec/views/spree/orders/show.html.haml_spec.rb @@ -43,8 +43,6 @@ describe "spree/orders/show.html.haml" do end it "handles broken images" do - pending "https://github.com/openfoodfoundation/openfoodnetwork/issues/9279" - image, = order.line_items.first.variant.product.images << Spree::Image.new( attachment: fixture_file_upload("logo.png", "image/png") )