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

fixed ordering

Browse Source
This commit is contained in:
vabene1111
2021-05-20 17:16:25 +02:00
parent be225d2b8c
commit 03c78f539d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cookbook/helper/recipe_search.py
View File

@@ -30,6 +30,10 @@ def search_recipes(request, queryset, params):
return queryset.filter(pk__in=list(set(last_viewed_recipes))[-search_last_viewed:]) return queryset.filter(pk__in=list(set(last_viewed_recipes))[-search_last_viewed:])
queryset = queryset.annotate(
new_recipe=Case(When(created_at__gte=(datetime.now() - timedelta(days=7)), then=Value(100)),
default=Value(0), )).order_by('-new_recipe', 'name')
if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', if settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
'django.db.backends.postgresql']: 'django.db.backends.postgresql']:
queryset = queryset.annotate(similarity=TrigramSimilarity('name', search_string), ).filter( queryset = queryset.annotate(similarity=TrigramSimilarity('name', search_string), ).filter(
@@ -63,10 +67,6 @@ def search_recipes(request, queryset, params):
if search_internal == 'true': if search_internal == 'true':
queryset = queryset.filter(internal=True) queryset = queryset.filter(internal=True)
queryset = queryset.annotate(
new_recipe=Case(When(created_at__gte=(datetime.now() - timedelta(days=7)), then=Value(100)),
default=Value(0), )).order_by('-new_recipe', 'name')
if search_random == 'true': if search_random == 'true':
queryset = queryset.order_by("?") queryset = queryset.order_by("?")