raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

#11068, resolve conflicts

Browse Source
This commit is contained in:
Ahmed Ejaz
2023-11-28 15:55:30 +05:00
parent d7f2cbf882
commit d1224ea022
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/components/vertical_ellipsis_menu/component.scss
View File

@@ -30,7 +30,8 @@
display: block;
}
& > a {
& > a,
p {
display: block;
padding: 5px 10px;
cursor: pointer;

8
app/views/admin/products_v3/_table.html.haml
View File

@@ -70,6 +70,10 @@
= 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"
}
= t('admin.products_page.actions.delete')
- product.variants.each_with_index do |variant, variant_index|
= form.fields_for("products][#{product_index}][variants_attributes][", variant, variant_index:) do |variant_form|
@@ -108,3 +112,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')

23
app/views/admin/products_v3/components/_product_actions.html.haml
View File

@@ -1,23 +0,0 @@
.vertical-ellipsis-menu{ "data-controller": "vertical-ellipsis-menu" }
%i.fa.fa-ellipsis-v{ "data-action": "click->vertical-ellipsis-menu#toggle" }
.vertical-ellipsis-menu-content{ "data-vertical-ellipsis-menu-target": "content" }
- if defined?(variant)
= link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(product, variant), class: "vertical-ellipsis-menu-content-item"
- if product.variants.size > 1
%span{
"data-controller": "modal-link",
"data-action": "click->modal-link#open",
"data-modal-link-target-value": "delete_variant",
"class": "vertical-ellipsis-menu-content-item"
}
= t('admin.products_page.actions.delete')
- else
= link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product), class: "vertical-ellipsis-menu-content-item"
= link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product), class: "vertical-ellipsis-menu-content-item"
%span{
"data-controller": "modal-link",
"data-action": "click->modal-link#open",
"data-modal-link-target-value": "delete_product",
"class": "vertical-ellipsis-menu-content-item"
}
= t('admin.products_page.actions.delete')