mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicate shopping recipes when auto-add enabled

Browse Source
This commit is contained in:
smilerz
2022-02-14 17:47:17 -06:00
parent 3db55cd82b
commit 57658e76f5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cookbook/views/views.py
View File

@@ -12,6 +12,7 @@ from django.contrib.auth.models import Group
from django.contrib.auth.password_validation import validate_password from django.contrib.auth.password_validation import validate_password
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.db.models import Avg, Q, Sum from django.db.models import Avg, Q, Sum
from django.db.models.functions import Lower
from django.http import HttpResponseRedirect, JsonResponse from django.http import HttpResponseRedirect, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse, reverse_lazy from django.urls import reverse, reverse_lazy

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

@@ -207,8 +207,7 @@ export default {
if (!cancel) { if (!cancel) {
console.log("saving", { ...this.mealplan_settings, ...this.entryEditing }) console.log("saving", { ...this.mealplan_settings, ...this.entryEditing })
this.$bvModal.hide(`edit-modal`) 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 } })
console.log("after emit", { ...this.mealplan_settings, ...this.entryEditing }.addshopping)
} }
}, },
deleteEntry() { deleteEntry() {