mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Merge pull request #11198 from dacook/admin_v3-table-tweaks
🚧 Products v3: table and menu tweaks
This commit is contained in:
@@ -41,7 +41,7 @@
|
||||
%td.align-left
|
||||
.line-clamp-1= product.taxons.map(&:name).join(', ')
|
||||
%td.align-left
|
||||
.line-clamp-1= product.tax_category&.name
|
||||
.line-clamp-1= product.tax_category&.name || "None" # TODO: convert to dropdown, else translate hardcoded string.
|
||||
%td.align-left
|
||||
.line-clamp-1= product.inherits_properties ? 'YES' : 'NO' #TODO: consider using https://github.com/RST-J/human_attribute_values, else use I18n.t (also below)
|
||||
- product.variants.each do |variant|
|
||||
@@ -59,9 +59,9 @@
|
||||
%td.align-left
|
||||
.line-clamp-1= variant.product.supplier.name # same as product
|
||||
%td.align-left
|
||||
.line-clamp-1= variant.product.taxons.map(&:name).join(', ') # same as product
|
||||
-# empty
|
||||
%td.align-left
|
||||
.line-clamp-1= variant.tax_category&.name
|
||||
-# empty
|
||||
%td.align-left
|
||||
.line-clamp-1= variant.product.inherits_properties ? 'YES' : 'NO' # same as product
|
||||
-# empty
|
||||
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
- content_for :sub_menu do
|
||||
%ul#sub_nav.inline-menu
|
||||
= tab :products, match_path: '/products'
|
||||
= tab :products
|
||||
= tab :properties
|
||||
= tab :variant_overrides, url: main_app.admin_inventory_path, match_path: '/inventory'
|
||||
= tab :import, url: main_app.admin_product_import_path, match_path: '/product_import'
|
||||
- if feature?(:new_products_page, spree_current_user)
|
||||
= tab :new_products, url: main_app.admin_new_products_path, match_path: '/new_products'
|
||||
= tab :new_products, url: main_app.admin_new_products_path
|
||||
- if feature?(:admin_style_v3, spree_current_user)
|
||||
= tab :products_v3, url: main_app.admin_products_v3_path
|
||||
|
||||
Reference in New Issue
Block a user