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

Merge branch 'additional_fixes' into feature/custom_filters

Browse Source
This commit is contained in:
smilerz
2022-02-08 09:05:07 -06:00
parent 93b7e5790d 88b3ba1427
commit dc71260baa
13 changed files with 229 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,7 +474,7 @@
<div class="row align-content-center">
<div class="col col-md-6" style="margin-top: 2vh">
<b-dropdown id="sortby" :text="$t('sort_by')" variant="link" toggle-class="text-decoration-none " class="m-0 p-0">
<b-dropdown id="sortby" :text="sortByLabel" variant="link" toggle-class="text-decoration-none " class="m-0 p-0">
<div v-for="o in sortOptions" :key="o.id">
<b-dropdown-item
v-on:click="
@@ -627,6 +627,13 @@ export default {
locale: function () {
return window.CUSTOM_LOCALE
},
sortByLabel: function () {
if (this.search.sort_order.length == 1) {
return this.search.sort_order[0].text
} else {
return this.$t("sort_by")
}
},
yesterday: function () {
const now = new Date()
return new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1)
@@ -1014,7 +1021,6 @@ export default {
rating: rating,
internal: this.search.search_internal,
random: this.random_search,
_new: this.ui.sort_by_new,
timescooked: timescooked,
makenow: this.search.makenow || undefined,
lastcooked: lastcooked,
@@ -1028,6 +1034,7 @@ export default {
}
if (!this.searchFiltered()) {
params.options.query.last_viewed = this.ui.recently_viewed
params._new = this.ui.sort_by_new
}
return params
},
@@ -1039,7 +1046,7 @@ export default {
this.search?.search_units?.length !== 0 ||
this.random_search ||
this.search?.search_filter ||
this.search.sort_order.length !== 0 ||
this.search.sort_order.length > 1 ||
this.search?.search_rating !== undefined ||
(this.search.timescooked !== undefined && this.search.timescooked !== "") ||
this.search.makenow !== false ||
@@ -1048,7 +1055,7 @@ export default {
if (ignore_string) {
return filtered
} else {
return filtered || this.search?.search_input != ""
return filtered || this.search?.search_input != "" || this.search.sort_order.length <= 1
}
},
addFields(field) {