From 30dc07d0d7b6991f21a1acf37ad0538bd4848463 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Tue, 13 Oct 2020 10:27:43 -0600 Subject: [PATCH 1/4] Remove Django version decrement from requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 83b8924d..deed420c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=2.2.13,<3 +Django django-bootstrap4-form celery django-celery-beat From 39d810778a293ccc1ca96db832b1b661860fe4dd Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Tue, 13 Oct 2020 11:20:09 -0600 Subject: [PATCH 2/4] filter import updated to Django recommended syntax, changed to decorator, and only filter user field if authenticated --- helpdesk/templatetags/saved_queries.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/helpdesk/templatetags/saved_queries.py b/helpdesk/templatetags/saved_queries.py index c3f667d3..533e13a6 100644 --- a/helpdesk/templatetags/saved_queries.py +++ b/helpdesk/templatetags/saved_queries.py @@ -5,15 +5,22 @@ templatetags/saved_queries.py - This template tag returns previously saved queries. Therefore you don't need to modify any views. """ -from django.template import Library +from django import template from django.db.models import Q from helpdesk.models import SavedSearch +register = template.Library() + + +@register.filter def saved_queries(user): try: - user_saved_queries = SavedSearch.objects.filter(Q(user=user) | Q(shared__exact=True)) + filters = Q(shared__exact=True) + if user.is_authenticated: + filters |= Q(user=user) + user_saved_queries = SavedSearch.objects.filter(filters) return user_saved_queries except Exception as e: import sys @@ -21,7 +28,3 @@ def saved_queries(user): file=sys.stderr) print(e, file=sys.stderr) return '' - - -register = Library() -register.filter('saved_queries', saved_queries) From d3cb9fdf239aa428d49a14a223452ae73fa81256 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Tue, 13 Oct 2020 11:20:58 -0600 Subject: [PATCH 3/4] Corrected date_created field to current created field as it exists in models.py --- helpdesk/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/query.py b/helpdesk/query.py index c94367d2..ea30b279 100644 --- a/helpdesk/query.py +++ b/helpdesk/query.py @@ -163,7 +163,7 @@ class __Query__: to a Serializer called DatatablesTicketSerializer in serializers.py. """ objects = self.get() - order_by = '-date_created' + order_by = '-created' draw = int(kwargs.get('draw', [0])[0]) length = int(kwargs.get('length', [25])[0]) start = int(kwargs.get('start', [0])[0]) From 58a23fed13a63de9d45f04e25d485b99af01a3a8 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Tue, 13 Oct 2020 13:01:18 -0600 Subject: [PATCH 4/4] Check user is authenticated and usersettings_helpdesk model is created before attempting to read a tickets_per_page, otherwise use default value --- helpdesk/views/staff.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index 7c474019..6a028ec9 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -99,7 +99,10 @@ def dashboard(request): with options for them to 'Take' ownership of said tickets. """ # user settings num tickets per page - tickets_per_page = request.user.usersettings_helpdesk.tickets_per_page or 25 + if request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'): + tickets_per_page = request.user.usersettings_helpdesk.tickets_per_page + else: + tickets_per_page = 25 # page vars for the three ticket tables user_tickets_page = request.GET.get(_('ut_page'), 1)