holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-22 16:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix saved queries when running in Django 2.0+, for #613

Browse Source
This commit is contained in:
Garret Wassermann 2018-06-27 02:27:24 -04:00
parent 08fc9b5aac
commit 15985e286f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
helpdesk/views/staff.py
View File

@ -9,6 +9,7 @@ views/staff.py - The bulk of the application - provides most business logic and
from __future__ import unicode_literals from __future__ import unicode_literals
from datetime import datetime, timedelta from datetime import datetime, timedelta
import django.VERSION as DJANGO_VERSION
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.decorators import user_passes_test from django.contrib.auth.decorators import user_passes_test
@ -831,7 +832,11 @@ def ticket_list(request):
from helpdesk.lib import b64decode from helpdesk.lib import b64decode
try: try:
if six.PY3: if six.PY3:
query_params = json.loads(b64decode(str(saved_query.query)).decode()) if DJANGO_VERSION[0] > 1:
# if Django >= 2.0
query_params = json.loads(b64decode(str(saved_query.query).lstrip("b\\'")).decode())
else:
query_params = json.loads(b64decode(str(saved_query.query)).decode())
else: else:
query_params = json.loads(b64decode(str(saved_query.query))) query_params = json.loads(b64decode(str(saved_query.query)))
except ValueError: except ValueError:
@ -1138,7 +1143,11 @@ def run_report(request, report):
from helpdesk.lib import b64decode from helpdesk.lib import b64decode
try: try:
if six.PY3: if six.PY3:
query_params = json.loads(b64decode(str(saved_query.query)).decode()) if DJANGO_VERSION[0] > 1:
# if Django >= 2.0
query_params = json.loads(b64decode(str(saved_query.query).lstrip("b\\'")).decode())
else:
query_params = json.loads(b64decode(str(saved_query.query)).decode())
else: else:
query_params = json.loads(b64decode(str(saved_query.query))) query_params = json.loads(b64decode(str(saved_query.query)))
except json.JSONDecodeError: except json.JSONDecodeError: