From 5e3f94fcf7dba4e648e5b4a8a7d128d2e6bdbf6f Mon Sep 17 00:00:00 2001 From: Chris Scoggins Date: Thu, 3 Feb 2022 12:21:35 -0600 Subject: [PATCH] fix after rebase --- vue/src/apps/RecipeSearchView/RecipeSearchView.vue | 2 +- vue/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue index 039b93f1..e0e666ba 100644 --- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue +++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue @@ -826,7 +826,7 @@ export default { this.facets = result.data.facets this.recipes = [...this.removeDuplicates(result.data.results, (recipe) => recipe.id)] 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 = [] this.meal_plans.forEach((x) => mealPlans.push(x.recipe.id)) this.recipes = this.recipes.filter((recipe) => !mealPlans.includes(recipe.id)) diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json index 4454b401..da0303fd 100644 --- a/vue/src/locales/en.json +++ b/vue/src/locales/en.json @@ -296,7 +296,7 @@ "Foods": "Foods", "review_shopping": "Review shopping entries before saving", "view_recipe": "View Recipe", - "enable_expert": "Enable Export Mode", + "enable_expert": "Enable Expert Mode", "expert_mode": "Expert Mode", "simple_mode": "Simple Mode", "advanced": "Advanced",