Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-04 13:05:21 +02:00
Code Issues Releases Activity

fix: Show All Recipes in Cookbook Regardless of Sort (#4908)

Browse source 
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
Michael Genson 2025-01-20 07:01:34 -06:00 • committed by GitHub
parent c096605fc9
commit 0d96ec3858
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/components/Domain/Cookbook/CookbookPage.vue
View file

@ -104,9 +104,12 @@
} }
const response = await actions.updateOne(editTarget.value); const response = await actions.updateOne(editTarget.value);
// if name changed, redirect to new slug
if (response?.slug && book.value?.slug !== response?.slug) { if (response?.slug && book.value?.slug !== response?.slug) {
// if name changed, redirect to new slug
router.push(`/g/${route.value.params.groupSlug}/cookbooks/${response?.slug}`); router.push(`/g/${route.value.params.groupSlug}/cookbooks/${response?.slug}`);
} else {
// otherwise reload the page, since the recipe criteria changed
router.go(0);
} }
dialogStates.edit = false; dialogStates.edit = false;
editTarget.value = null; editTarget.value = null;

22
frontend/components/Domain/Recipe/RecipeCardSection.vue
View file

@ -219,16 +219,20 @@ export default defineComponent({
const router = useRouter(); const router = useRouter();
const queryFilter = computed(() => { const queryFilter = computed(() => {
const orderBy = props.query?.orderBy || preferences.value.orderBy; return props.query.queryFilter || null;
const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
if (props.query.queryFilter && orderByFilter) { // TODO: allow user to filter out null values when ordering by a value that may be null (such as lastMade)
return `(${props.query.queryFilter}) AND ${orderByFilter}`;
} else if (props.query.queryFilter) { // const orderBy = props.query?.orderBy || preferences.value.orderBy;
return props.query.queryFilter; // const orderByFilter = preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
} else {
return orderByFilter; // 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) { async function fetchRecipes(pageCount = 1) {

1
mealie/repos/repository_recipes.py
View file

@ -206,6 +206,7 @@ class RepositoryRecipes(HouseholdRepositoryGeneric[Recipe, RecipeModel]):
# Apply options late, so they do not get used for counting # Apply options late, so they do not get used for counting
q = q.options(*RecipeSummary.loader_options()) q = q.options(*RecipeSummary.loader_options())
try: try:
self.logger.debug(f"Recipe Pagination Query: {pagination_result}")
data = self.session.execute(q).scalars().unique().all() data = self.session.execute(q).scalars().unique().all()
except Exception as e: except Exception as e:
self._log_exception(e) self._log_exception(e)