From 583aee204e238e77e145d53b33160c86aeefbe8e Mon Sep 17 00:00:00 2001
From: Chris Scoggins <smilerz@gmail.com>
Date: Tue, 1 Feb 2022 11:38:11 -0600
Subject: [PATCH] fix view recipes in Model View

---
 cookbook/helper/recipe_search.py                   | 6 +++---
 vue/src/apps/RecipeSearchView/RecipeSearchView.vue | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cookbook/helper/recipe_search.py b/cookbook/helper/recipe_search.py
index c119d58ab..b1032a4d1 100644
--- a/cookbook/helper/recipe_search.py
+++ b/cookbook/helper/recipe_search.py
@@ -41,19 +41,19 @@ class RecipeSearch():
         self._string = params.get('string').strip() if params.get('string', None) else None
         self._rating = self._params.get('rating', None)
         self._keywords = {
-            'or': self._params.get('keywords_or', None),
+            'or': self._params.get('keywords_or', None) or self._params.get('keywords', None),
             'and': self._params.get('keywords_and', None),
             'or_not': self._params.get('keywords_or_not', None),
             'and_not': self._params.get('keywords_and_not', None)
         }
         self._foods = {
-            'or': self._params.get('foods_or', None),
+            'or': self._params.get('foods_or', None) or self._params.get('foods', None),
             'and': self._params.get('foods_and', None),
             'or_not': self._params.get('foods_or_not', None),
             'and_not': self._params.get('foods_and_not', None)
         }
         self._books = {
-            'or': self._params.get('books_or', None),
+            'or': self._params.get('books_or', None) or self._params.get('books', None),
             'and': self._params.get('books_and', None),
             'or_not': self._params.get('books_or_not', None),
             'and_not': self._params.get('books_and_not', None)
diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
index 08288287f..daf75b3da 100644
--- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
+++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
@@ -498,7 +498,7 @@
                 <div class="row">
                     <div class="col col-md-12">
                         <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); grid-gap: 0.8rem">
-                            <template v-if="!searchFiltered()">
+                            <template v-if="searchFiltered()">
                                 <recipe-card v-bind:key="`mp_${m.id}`" v-for="m in meal_plans" :recipe="m.recipe" :meal_plan="m" :footer_text="m.meal_type_name" footer_icon="far fa-calendar-alt"></recipe-card>
                             </template>
                             <recipe-card v-for="r in recipes" v-bind:key="r.id" :recipe="r" :footer_text="isRecentOrNew(r)[0]" :footer_icon="isRecentOrNew(r)[1]"></recipe-card>
@@ -694,7 +694,7 @@ export default {
             const field = [
                 [this.$t("search_rank"), "score"],
                 [this.$t("Name"), "name"],
-                [this.$t("date_cooked"), "lastcooked"],
+                [this.$t("last_cooked"), "lastcooked"],
                 [this.$t("Rating"), "rating"],
                 [this.$t("times_cooked"), "favorite"],
                 [this.$t("date_created"), "created_at"],
@@ -1031,8 +1031,6 @@ export default {
                 this.search.makenow !== false ||
                 (this.search.lastcooked !== undefined && this.search.lastcooked !== "")
 
-            console.log()
-
             if (ignore_string) {
                 return filtered
             } else {