Fix after rebase
This commit is contained in:
@ -30,9 +30,10 @@ def search_recipes(request, queryset, params):
|
||||
if search_last_viewed > 0:
|
||||
last_viewed_recipes = ViewLog.objects.filter(
|
||||
created_by=request.user, space=request.space,
|
||||
created_at__gte=datetime.now() - timedelta(days=14)).values_list(
|
||||
'recipe__pk', flat=True).distinct()
|
||||
return queryset.filter(pk__in=list(set(last_viewed_recipes))[-search_last_viewed:])
|
||||
created_at__gte=datetime.now() - timedelta(days=14)
|
||||
).order_by('pk').values_list('recipe__pk', flat=True).distinct()
|
||||
|
||||
return queryset.filter(pk__in=last_viewed_recipes[len(last_viewed_recipes) - min(len(last_viewed_recipes), search_last_viewed):])
|
||||
|
||||
queryset = queryset.annotate(
|
||||
new_recipe=Case(When(
|
||||
|
Reference in New Issue
Block a user