cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/custom_filters

Browse Source 
# Conflicts:
#	vue/src/components/MealPlanEditModal.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2022-02-17 10:57:35 +01:00
parent a76c4365ea caeaab22ce
commit 3292c596ff
7 changed files with 131 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vue/src/components/MealPlanEditModal.vue
View File

@ -206,7 +206,7 @@ export default {
}
if (!cancel) {
this.$bvModal.hide(`edit-modal`)
this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing })
this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.entryEditing.addshopping && !this.autoMealPlan } })
}
},
deleteEntry() {