cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recently viewed

Browse Source
This commit is contained in:
vabene1111
2021-05-30 19:40:46 +02:00
parent 28b8973259
commit b10163e309
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/helper/recipe_search.py
View File

@ -27,8 +27,7 @@ def search_recipes(request, queryset, params):
last_viewed_recipes = ViewLog.objects.filter(created_by=request.user, space=request.space, last_viewed_recipes = ViewLog.objects.filter(created_by=request.user, space=request.space,
created_at__gte=datetime.now() - timedelta(days=14)).values_list( created_at__gte=datetime.now() - timedelta(days=14)).values_list(
'recipe__pk', flat=True).distinct() 'recipe__pk', flat=True).distinct()
return queryset.filter(pk__in=last_viewed_recipes[len(last_viewed_recipes)-search_last_viewed:])
return queryset.filter(pk__in=list(set(last_viewed_recipes))[-search_last_viewed:])
queryset = queryset.annotate( queryset = queryset.annotate(
new_recipe=Case(When(created_at__gte=(datetime.now() - timedelta(days=7)), then=Value(100)), new_recipe=Case(When(created_at__gte=(datetime.now() - timedelta(days=7)), then=Value(100)),

2
cookbook/static/vue/js/recipe_search_view.js
View File

File diff suppressed because one or more lines are too long

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

@ -349,7 +349,8 @@ export default {
loadRecentlyViewed: function () { loadRecentlyViewed: function () {
let apiClient = new ApiApiFactory() let apiClient = new ApiApiFactory()
if (this.settings.recently_viewed > 0) { if (this.settings.recently_viewed > 0) {
apiClient.listRecipes({options: {query: {last_viewed: this.settings.recently_viewed}}}).then(result => { apiClient.listRecipes(undefined, undefined, undefined, undefined, undefined, undefined,
undefined, undefined,undefined, undefined,undefined,{query: {last_viewed: this.settings.recently_viewed}}).then(result => {
this.last_viewed_recipes = result.data.results this.last_viewed_recipes = result.data.results
}) })
} else { } else {