Merge branch 'develop' into feature/copy-to-new-recipe

This commit is contained in:
vabene1111
2022-02-17 10:55:59 +01:00
committed by GitHub
6 changed files with 81 additions and 9 deletions

View File

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