mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-07-24 15:49:42 +02:00
fix: Show All Recipes in Cookbook Regardless of Sort (#4908)
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
parent
c096605fc9
commit
0d96ec3858
3 changed files with 18 additions and 10 deletions
|
@ -219,16 +219,20 @@ export default defineComponent({
|
|||
const router = useRouter();
|
||||
|
||||
const queryFilter = computed(() => {
|
||||
const orderBy = props.query?.orderBy || preferences.value.orderBy;
|
||||
const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
|
||||
return props.query.queryFilter || null;
|
||||
|
||||
if (props.query.queryFilter && orderByFilter) {
|
||||
return `(${props.query.queryFilter}) AND ${orderByFilter}`;
|
||||
} else if (props.query.queryFilter) {
|
||||
return props.query.queryFilter;
|
||||
} else {
|
||||
return orderByFilter;
|
||||
}
|
||||
// TODO: allow user to filter out null values when ordering by a value that may be null (such as lastMade)
|
||||
|
||||
// const orderBy = props.query?.orderBy || preferences.value.orderBy;
|
||||
// const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
|
||||
|
||||
// if (props.query.queryFilter && orderByFilter) {
|
||||
// return `(${props.query.queryFilter}) AND ${orderByFilter}`;
|
||||
// } else if (props.query.queryFilter) {
|
||||
// return props.query.queryFilter;
|
||||
// } else {
|
||||
// return orderByFilter;
|
||||
// }
|
||||
});
|
||||
|
||||
async function fetchRecipes(pageCount = 1) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue