Merge branch 'mealie-next' into fix/bump-sqlalchemy

This commit is contained in:
Michael Genson 2024-02-19 10:30:03 -06:00 committed by GitHub
commit 5db7a735d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 1 deletions

View File

@ -25,6 +25,7 @@
:label="$t('shopping-list.note')"
rows="1"
auto-grow
@keypress="handleNoteKeyPress"
></v-textarea>
</div>
<div class="d-flex align-end" style="gap: 20px">
@ -142,5 +143,14 @@ export default defineComponent({
listItem,
};
},
methods: {
handleNoteKeyPress(event) {
// Save on Enter
if (!event.shiftKey && event.key === "Enter") {
event.preventDefault();
this.$emit("save");
}
},
}
});
</script>

View File

@ -665,6 +665,11 @@ export default defineComponent({
return;
}
if (!createListItemData.value.foodId && !createListItemData.value.note) {
// don't create an empty item
return;
}
loadingCounter.value += 1;
// make sure it's inserted into the end of the list, which may have been updated
@ -676,7 +681,6 @@ export default defineComponent({
if (data) {
createListItemData.value = listItemFactory(createListItemData.value.isFood || false);
createEditorOpen.value = false;
refresh();
}
}