github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-21 22:13:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge branch 'mealie-next' into fix/admin-users-couldnt-delete-other-household-recipes

Browse source
This commit is contained in:
Mario Džoić 2025-07-28 18:40:58 +02:00 • committed by GitHub
commit 4c39c4cfa4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue
View file

@ -29,33 +29,31 @@
{{ activeText }}
</p>
<v-divider class="mb-4" />
<v-checkbox
<v-checkbox-btn
v-for="ing in unusedIngredients"
:key="ing.referenceId"
v-model="activeRefs"
:value="ing.referenceId"
class="mb-n2 mt-n2"
>
<template #label>
<RecipeIngredientHtml :markup="parseIngredientText(ing, recipe.settings.disableAmount)" />
</template>
</v-checkbox>
</v-checkbox-btn>
<template v-if="usedIngredients.length > 0">
<h4 class="py-3 ml-1">
{{ $t("recipe.linked-to-other-step") }}
</h4>
<v-checkbox
<v-checkbox-btn
v-for="ing in usedIngredients"
:key="ing.referenceId"
v-model="activeRefs"
:value="ing.referenceId"
class="mb-n2 mt-n2"
>
<template #label>
<RecipeIngredientHtml :markup="parseIngredientText(ing, recipe.settings.disableAmount)" />
</template>
</v-checkbox>
</v-checkbox-btn>
</template>
</v-card-text>

21
frontend/components/Domain/Recipe/RecipeScaleEditButton.vue
View file

@ -66,12 +66,12 @@
<v-card-text class="mt-n5">
<div class="mt-4 d-flex align-center">
<v-text-field
:model-value="yieldQuantityEditorValue"
:model-value="yieldQuantity"
type="number"
:min="0"
variant="underlined"
hide-spin-buttons
@update:model-value="recalculateScale(yieldQuantityEditorValue)"
@update:model-value="recalculateScale(parseFloat($event) || 0)"
/>
<v-tooltip
end
@ -81,6 +81,7 @@
<v-btn
v-bind="props"
icon
flat
class="mx-1"
size="small"
@click="scale = 1"
@ -178,21 +179,8 @@ export default defineNuxtComponent({
: "";
});
// only update yield quantity when the menu opens, so we don't override the user's input
const yieldQuantityEditorValue = ref(recipeYieldAmount.value.scaledAmount);
watch(
() => menu.value,
() => {
if (!menu.value) {
return;
}
yieldQuantityEditorValue.value = recipeYieldAmount.value.scaledAmount;
},
);
const disableDecrement = computed(() => {
return recipeYieldAmount.value.scaledAmount <= 1;
return yieldQuantity.value <= 1;
});
return {
@ -202,7 +190,6 @@ export default defineNuxtComponent({
recalculateScale,
yieldDisplay,
yieldQuantity,
yieldQuantityEditorValue,
disableDecrement,
};
},

38
frontend/components/Domain/ShoppingList/ShoppingListItem.vue
View file

@ -8,24 +8,26 @@
class="flex-nowrap align-center"
>
<v-col :cols="itemLabelCols">
<v-checkbox
v-model="listItem.checked"
class="mt-0"
color="null"
hide-details
density="compact"
:label="listItem.note!"
@change="$emit('checked', listItem)"
>
<template #label>
<div :class="listItem.checked ? 'strike-through' : ''">
<RecipeIngredientListItem
:ingredient="listItem"
:disable-amount="!(listItem.isFood || listItem.quantity !== 1)"
/>
</div>
</template>
</v-checkbox>
<div class="d-flex align-center flex-nowrap">
<v-checkbox
v-model="listItem.checked"
hide-details
density="compact"
class="mt-0"
color="null"
@change="$emit('checked', listItem)"
/>
<div
class="ml-2 text-truncate"
:class="listItem.checked ? 'strike-through' : ''"
style="min-width: 0;"
>
<RecipeIngredientListItem
:ingredient="listItem"
:disable-amount="!(listItem.isFood || listItem.quantity !== 1)"
/>
</div>
</div>
</v-col>
<v-spacer />
<v-col