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

Merge branch 'mealie-next' into fix/fix-print-view

Browse source
This commit is contained in:
Kuchenpirat 2025-07-10 19:02:12 +02:00 • committed by GitHub
commit dfcf47f9e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/lib/api/user/recipes/recipe.ts
View file

@ -219,10 +219,7 @@ export class RecipeAPI extends BaseCRUDAPI<CreateRecipe, Recipe, Recipe> {
async getAllTimelineEvents(page = 1, perPage = -1, params = {} as any) { async getAllTimelineEvents(page = 1, perPage = -1, params = {} as any) {
return await this.requests.get<PaginationData<RecipeTimelineEventOut>>( return await this.requests.get<PaginationData<RecipeTimelineEventOut>>(
routes.recipesTimelineEvent, routes.recipesTimelineEvent, { page, perPage, ...params },
{
params: { page, perPage, ...params },
},
); );
} }

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

@ -707,7 +707,7 @@ export default defineNuxtComponent({
} }
}); });
if (hasChanged) { if (hasChanged) {
updateListItems(); updateUncheckedListItems();
} }
} }
@ -727,7 +727,9 @@ export default defineNuxtComponent({
} }
}); });
if (hasChanged) { if (hasChanged) {
updateListItems(); listItems.unchecked = [...listItems.unchecked, ...listItems.checked];
listItems.checked = [];
updateUncheckedListItems();
} }
} }
@ -1051,8 +1053,13 @@ export default defineNuxtComponent({
.sort(sortCheckedItems); .sort(sortCheckedItems);
} }
// Update the item if it's checked, otherwise updateUncheckedListItems will handle it
if (item.checked) {
shoppingListItemActions.updateItem(item);
}
updateListItemOrder(); updateListItemOrder();
updateListItems(); updateUncheckedListItems();
} }
function deleteListItem(item: ShoppingListItemOut) { function deleteListItem(item: ShoppingListItemOut) {
@ -1144,7 +1151,7 @@ export default defineNuxtComponent({
// since the user has manually reordered the list, we should preserve this order // since the user has manually reordered the list, we should preserve this order
preserveItemOrder.value = true; preserveItemOrder.value = true;
updateListItems(); updateUncheckedListItems();
} }
function updateIndexUncheckedByLabel(labelName: string, labeledUncheckedItems: ShoppingListItemOut[]) { function updateIndexUncheckedByLabel(labelName: string, labeledUncheckedItems: ShoppingListItemOut[]) {
@ -1167,7 +1174,7 @@ export default defineNuxtComponent({
// save changes // save changes
listItems.unchecked = allUncheckedItems; listItems.unchecked = allUncheckedItems;
listItems.checked = shoppingList.value?.listItems?.filter(item => item.checked) || []; listItems.checked = shoppingList.value?.listItems?.filter(item => item.checked) || [];
updateListItems(); updateUncheckedListItems();
} }
function deleteListItems(items: ShoppingListItemOut[]) { function deleteListItems(items: ShoppingListItemOut[]) {
@ -1187,27 +1194,23 @@ export default defineNuxtComponent({
refresh(); refresh();
} }
function updateListItems() { function updateUncheckedListItems() {
if (!shoppingList.value?.listItems) { if (!shoppingList.value?.listItems) {
return; return;
} }
// Set Position // Set position for unchecked items
shoppingList.value.listItems = listItems.unchecked.concat(listItems.checked).map((itm: ShoppingListItemOut, idx: number) => { listItems.unchecked.forEach((item: ShoppingListItemOut, idx: number) => {
itm.position = idx; item.position = idx;
return itm;
});
shoppingList.value.listItems.forEach((item) => {
shoppingListItemActions.updateItem(item); shoppingListItemActions.updateItem(item);
}); });
refresh(); refresh();
} }
return { return {
...toRefs(state), ...toRefs(state),
addRecipeReferenceToList, addRecipeReferenceToList,
updateListItems,
allLabels, allLabels,
contextMenu, contextMenu,
contextMenuAction, contextMenuAction,