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

fix after rebase

Browse Source
This commit is contained in:
Chris Scoggins
2022-02-03 12:21:35 -06:00
parent dcad389010
commit 5e3f94fcf7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vue/src/apps/RecipeSearchView/RecipeSearchView.vue
View File

@ -826,7 +826,7 @@ export default {
this.facets = result.data.facets this.facets = result.data.facets
this.recipes = [...this.removeDuplicates(result.data.results, (recipe) => recipe.id)] this.recipes = [...this.removeDuplicates(result.data.results, (recipe) => recipe.id)]
if (!this.searchFiltered()) { if (!this.searchFiltered()) {
// if meal plans are being shown - filter out any meal plan recipes from the recipe list // if meal plans are being shown (and only when search is unfiltered) - filter out any meal plan recipes from the recipe list
let mealPlans = [] let mealPlans = []
this.meal_plans.forEach((x) => mealPlans.push(x.recipe.id)) this.meal_plans.forEach((x) => mealPlans.push(x.recipe.id))
this.recipes = this.recipes.filter((recipe) => !mealPlans.includes(recipe.id)) this.recipes = this.recipes.filter((recipe) => !mealPlans.includes(recipe.id))

2
vue/src/locales/en.json
View File

@ -296,7 +296,7 @@
"Foods": "Foods", "Foods": "Foods",
"review_shopping": "Review shopping entries before saving", "review_shopping": "Review shopping entries before saving",
"view_recipe": "View Recipe", "view_recipe": "View Recipe",
"enable_expert": "Enable Export Mode", "enable_expert": "Enable Expert Mode",
"expert_mode": "Expert Mode", "expert_mode": "Expert Mode",
"simple_mode": "Simple Mode", "simple_mode": "Simple Mode",
"advanced": "Advanced", "advanced": "Advanced",