extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-16 02:48:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat-raise-404-if-anon

Browse Source
This commit is contained in:
Manuel Saelices
2017-10-04 03:46:28 +02:00
committed by GitHub
parent eec7024983 3b80429847
commit 36d4b7ec0d
18 changed files with 208 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
helpdesk/views/staff.py
View File

@ -24,6 +24,8 @@ from django.utils.html import escape
from django import forms
from django.utils import timezone
from django.utils import six
from helpdesk.forms import (
TicketForm, UserSettingsForm, EmailIgnoreForm, EditTicketForm, TicketCCForm,
TicketCCEmailForm, TicketCCUserForm, EditFollowUpForm, TicketDependencyForm
@ -815,7 +817,10 @@ def ticket_list(request):
import json
from helpdesk.lib import b64decode
try:
query_params = json.loads(b64decode(str(saved_query.query)))
if six.PY3:
query_params = json.loads(b64decode(str(saved_query.query)).decode())
else:
query_params = json.loads(b64decode(str(saved_query.query)))
except ValueError:
# Query deserialization failed. (E.g. was a pickled query)
return HttpResponseRedirect(reverse('helpdesk:list'))
@ -1112,7 +1117,10 @@ def run_report(request, report):
import json
from helpdesk.lib import b64decode
try:
query_params = json.loads(b64decode(str(saved_query.query)))
if six.PY3:
query_params = json.loads(b64decode(str(saved_query.query)).decode())
else:
query_params = json.loads(b64decode(str(saved_query.query)))
except:
return HttpResponseRedirect(reverse('helpdesk:report_index'))