From eca83eeec3c7b93e7aacab4c1725809d19138316 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sun, 3 Dec 2023 23:08:48 +0500 Subject: [PATCH] #11068, update delete links for uniq modal ids --- app/views/admin/products_v3/_table.html.haml | 13 ++++++------- .../controllers/product_actions_controller.js | 8 ++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/views/admin/products_v3/_table.html.haml b/app/views/admin/products_v3/_table.html.haml index 40938e3ac4..5066b023d2 100644 --- a/app/views/admin/products_v3/_table.html.haml +++ b/app/views/admin/products_v3/_table.html.haml @@ -70,9 +70,8 @@ = render(VerticalEllipsisMenu::Component.new) do = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product) = link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product) - %p{"data-controller": "modal-link", "data-action": "click->modal-link#open", - "data-modal-link-target-value": "delete_product", "class": "delete" - } + %p{ "data-controller": "modal-link", "data-action": "click->modal-link#open", + "data-modal-link-target-value": "delete_product_#{product.id}", "class": "delete" } = t('admin.products_page.actions.delete') - product.variants.each_with_index do |variant, variant_index| @@ -112,7 +111,7 @@ %td.align-right = render(VerticalEllipsisMenu::Component.new) do = link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(product, variant) - %p{"data-controller": "modal-link", "data-action": "click->modal-link#open", - "data-modal-link-target-value": "delete_variant", "class": "delete" - } - = t('admin.products_page.actions.delete') + - if product.variants.size > 1 + %p{ "data-controller": "modal-link", "data-action": "click->modal-link#open", + "data-modal-link-target-value": "delete_variant_#{variant.id}", "class": "delete" } + = t('admin.products_page.actions.delete') diff --git a/app/webpacker/controllers/product_actions_controller.js b/app/webpacker/controllers/product_actions_controller.js index 2d2523e629..0d60b6ba15 100644 --- a/app/webpacker/controllers/product_actions_controller.js +++ b/app/webpacker/controllers/product_actions_controller.js @@ -1,9 +1,13 @@ import ApplicationController from "./application_controller"; export default class extends ApplicationController { - static values = {currentId: Number, currentVariantId: Number}; + static values = {currentId: Number}; - delete() { + deleteProduct() { + debugger + } + deleteVariant(){ + debugger } }