From cd11cc58cf87b1d12d08d68f9c8419895db8faab Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Fri, 15 May 2020 12:49:31 +0200 Subject: [PATCH] possible duplicate fix --- cookbook/urls.py | 2 +- cookbook/views/views.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cookbook/urls.py b/cookbook/urls.py index 249099db..5c8aac85 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -13,7 +13,7 @@ urlpatterns = [ path('plan/', views.meal_plan, name='view_plan'), path('plan/entry/', views.meal_plan_entry, name='view_plan_entry'), path('shopping/', views.shopping_list, name='view_shopping'), - path('settings/', views.settings, name='view_settings'), + path('settings/', views.user_settings, name='view_settings'), path('history/', views.history, name='view_history'), path('import/', import_export.import_recipe, name='view_import'), diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 49def55d..23757507 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -7,11 +7,12 @@ from django.contrib.auth.forms import PasswordChangeForm from django.db.models import Q from django.http import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 -from django.urls import reverse_lazy from django.utils import timezone from django_tables2 import RequestConfig from django.utils.translation import gettext as _ +from django.conf import settings + from cookbook.filters import RecipeFilter from cookbook.forms import * from cookbook.helper.permission_helper import group_required @@ -44,7 +45,11 @@ def search(request): RequestConfig(request, paginate={'per_page': 25}).configure(table) if request.GET == {}: - last_viewed = RecipeTable(Recipe.objects.filter(viewlog__created_by=request.user).order_by('-viewlog__created_at').all()[0:5]) + qs = Recipe.objects.filter(viewlog__created_by=request.user).order_by('-viewlog__created_at').all()[0:5] + if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2': + qs = Recipe.objects.filter(viewlog__created_by=request.user).distinct('name').order_by('-viewlog__created_at').all()[0:5] + + last_viewed = RecipeTable(qs) else: last_viewed = None @@ -201,7 +206,7 @@ def shopping_list(request): @group_required('guest') -def settings(request): +def user_settings(request): up = request.user.userpreference user_name_form = UserNameForm(instance=request.user)