Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-06 14:05:21 +02:00
Code Issues Releases Activity

feat: Remove "Is Food" and "Disable Amounts" Flags (#5684)

Browse source 
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
Michael Genson 2025-07-31 10:36:24 -05:00 • committed by GitHub
parent efc0d31724
commit 245ca5fe3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 173 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue
View file

@ -364,7 +364,6 @@ export default defineNuxtComponent({
confidence: {},
ingredient: {
quantity: 1.0,
disableAmount: false,
referenceId: uuid4(),
},
} as ParsedIngredient;
@ -409,10 +408,6 @@ export default defineNuxtComponent({
}
recipe.value.recipeIngredient = ingredients;
if (recipe.value.settings) {
recipe.value.settings.disableAmount = false;
}
const { response } = await api.recipes.updateOne(recipe.value.slug, recipe.value);
if (response?.status === 200) {

1
frontend/pages/group/data/recipes.vue
View file

@ -415,7 +415,6 @@ export default defineNuxtComponent({
showAssets: false,
landscapeView: false,
disableComments: false,
disableAmount: false,
locked: false,
});

6
frontend/pages/household/index.vue
View file

@ -95,12 +95,6 @@ export default defineNuxtComponent({
label: i18n.t("group.disable-users-from-commenting-on-recipes"),
description: i18n.t("group.disable-users-from-commenting-on-recipes-description"),
} as Preference,
{
key: "recipeDisableAmount",
value: household.value.preferences.recipeDisableAmount || false,
label: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food"),
description: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food-description"),
} as Preference,
];
});

27
frontend/pages/shopping-lists/[id].vue
View file

@ -762,31 +762,12 @@ export default defineNuxtComponent({
const contextActions = {
delete: "delete",
setIngredient: "setIngredient",
};
const contextMenu = [
{ title: i18n.t("general.delete"), action: contextActions.delete },
{ title: i18n.t("recipe.ingredient"), action: contextActions.setIngredient },
];
function contextMenuAction(action: string, item: ShoppingListItemOut, idx: number) {
if (!shoppingList.value?.listItems) {
return;
}
switch (action) {
case contextActions.delete:
shoppingList.value.listItems = shoppingList.value?.listItems.filter(itm => itm.id !== item.id);
break;
case contextActions.setIngredient:
shoppingList.value.listItems[idx].isFood = !shoppingList.value.listItems[idx].isFood;
break;
default:
break;
}
}
// =====================================
// Labels, Units, Foods
// TODO: Extract to Composable
@ -901,7 +882,7 @@ export default defineNuxtComponent({
shoppingList.value.listItems.forEach((item) => {
const key = item.checked
? checkedItemKey
: item.isFood && item.food?.name
: item.food?.name
? item.food.name
: item.note || "";
@ -1087,13 +1068,12 @@ export default defineNuxtComponent({
const createEditorOpen = ref(false);
const createListItemData = ref<ShoppingListItemOut>(listItemFactory());
function listItemFactory(isFood = false): ShoppingListItemOut {
function listItemFactory(): ShoppingListItemOut {
return {
id: uuid4(),
shoppingListId: id,
checked: false,
position: shoppingList.value?.listItems?.length || 1,
isFood,
quantity: 0,
note: "",
labelId: undefined,
@ -1144,7 +1124,7 @@ export default defineNuxtComponent({
shoppingList.value.listItems.push(createListItemData.value);
updateListItemOrder();
}
createListItemData.value = listItemFactory(createListItemData.value.isFood || false);
createListItemData.value = listItemFactory();
refresh();
}
@ -1217,7 +1197,6 @@ export default defineNuxtComponent({
addRecipeReferenceToList,
allLabels,
contextMenu,
contextMenuAction,
copyListItems,
createEditorOpen,
createListItem,