From 4600aab13a4003b0c2c5c9dd6f3a287ff3ed35fb Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Wed, 3 Feb 2021 20:28:36 +0100 Subject: [PATCH] fixed unit merge bug --- cookbook/templates/shopping_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/templates/shopping_list.html b/cookbook/templates/shopping_list.html index 4063f445a..c0643a777 100644 --- a/cookbook/templates/shopping_list.html +++ b/cookbook/templates/shopping_list.html @@ -573,7 +573,7 @@ if (entry.food.id === item.food.id && entry.food.name === item.food.name) { if (entry.unit === null && item.unit === null) { return true - } else if (entry.unit !== null && item.unit !== null && entry.unit.id === item.unit.id) { + } else if (entry.unit !== null && item.unit !== null && entry.unit.id === item.unit.id && entry.unit.name === item.unit.name) { return true } }