diff --git a/vue/src/apps/RecipeSearchView/AdvancedTreeSelect.vue b/vue/src/apps/RecipeSearchView/AdvancedTreeSelect.vue
deleted file mode 100644
index 8c4d219a6..000000000
--- a/vue/src/apps/RecipeSearchView/AdvancedTreeSelect.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
- {{ $t("or") }}
- {{ $t("and") }}
-
-
-
-
-
-
-
diff --git a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
index da7aae3b1..fb1329e6d 100644
--- a/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
+++ b/vue/src/apps/RecipeSearchView/RecipeSearchView.vue
@@ -113,7 +113,6 @@
{
window.scrollTo(0, 0)
@@ -579,12 +578,8 @@ export default {
buildParams: function () {
let params = {
query: this.search.search_input,
- keywords: this.search.search_keywords.map(function (A) {
- return A?.["id"] ?? A
- }),
- foods: this.search.search_foods.map(function (A) {
- return A?.["id"] ?? A
- }),
+ keywords: this.search.search_keywords,
+ foods: this.search.search_foods,
rating: this.search.search_ratings,
books: this.search.search_books.map(function (A) {
return A["id"]
@@ -601,19 +596,19 @@ export default {
if (!this.searchFiltered()) {
params.options = { query: { last_viewed: this.ui.recently_viewed } }
}
- return params
},
searchFiltered: function (ignore_string = false) {
let filtered =
this.search?.search_keywords?.length === 0 &&
this.search?.search_foods?.length === 0 &&
this.search?.search_books?.length === 0 &&
+ // this.settings?.pagination_page === 1 &&
!this.random_search &&
this.search?.search_ratings === undefined
if (ignore_string) {
- return !filtered
+ return filtered
} else {
- return !filtered && this.search?.search_input !== ""
+ return filtered && this.search?.search_input === ""
}
},
},