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 deleting product images (#12486)

Łukasz Adamczyke65bb56d2964
diff --git a/admin/app/javascript/spree/admin/controllers/media_form_controller.js b/admin/app/javascript/spree/admin/controllers/media_form_controller.js
index 16a5f4c65b..50e7f107f8 100644
--- a/admin/app/javascript/spree/admin/controllers/media_form_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/media_form_controller.js
@@ -14,12 +14,17 @@ export default class extends Controller {
if (idsToDelete.length && window.confirm('Are you sure?')) {
this.deleteButtonTarget.disabled = true
- destroy(this.deleteUrlValue, {
+ const response = await destroy(this.deleteUrlValue, {
body: {
ids: idsToDelete
},
responseKind: 'turbo-stream'
})
+
+ if (response.ok) {
+ this.deleteButtonTarget.disabled = false
+ this.deleteButtonTarget.classList.add('d-none')
+ }
}
}
diff --git a/admin/app/views/active_storage/_upload_form.html.erb b/admin/app/views/active_storage/_upload_form.html.erb
index ec82f5f8de..ebb71f6901 100644
--- a/admin/app/views/active_storage/_upload_form.html.erb
+++ b/admin/app/views/active_storage/_upload_form.html.erb
@@ -2,7 +2,7 @@
<% height ||= 300 %>
<% crop ||= false unless defined?(crop) %>
<% auto_submit ||= false %>
-<% can_delete ||= true %>
+<% can_delete ||= true unless defined?(can_delete) %>
<% css ||= '' %>
<% if field_name && form %>
diff --git a/admin/app/views/spree/admin/assets/edit.html.erb b/admin/app/views/spree/admin/assets/edit.html.erb
index 33d9147fbb..4ada6b63a0 100644
--- a/admin/app/views/spree/admin/assets/edit.html.erb
+++ b/admin/app/views/spree/admin/assets/edit.html.erb
@@ -17,8 +17,10 @@
</div>
</div>
<div class="modal-footer d-flex justify-content-between">
- <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
<%= turbo_save_button_tag %>
+ <%= link_to Spree.t('actions.destroy'), object_url(@asset),
+ data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: '_top' },
+ class: 'btn btn-danger ml-auto' if can?(:destroy, @asset) %>
</div>
<% end %>
</div>