holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-27 09:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

As of at least Django 1.5, calling __str__() on a CHOICES object returns a proxy object, not the actual text of the CHOICE. Change such calls to title() instead

Browse Source
This commit is contained in:
Jonathan Barratt 2015-06-04 13:04:14 +07:00
parent 6595eebd3f
commit 711eb6cea2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/views/staff.py
View File

@ -1013,7 +1013,7 @@ def run_report(request, report):
if report == 'userpriority':
title = _('User by Priority')
col1heading = _('User')
possible_options = [t[1].__str__() for t in Ticket.PRIORITY_CHOICES]
possible_options = [t[1].title() for t in Ticket.PRIORITY_CHOICES]
charttype = 'bar'
elif report == 'userqueue':
@ -1025,7 +1025,7 @@ def run_report(request, report):
elif report == 'userstatus':
title = _('User by Status')
col1heading = _('User')
possible_options = [s[1].__str__() for s in Ticket.STATUS_CHOICES]
possible_options = [s[1].title() for s in Ticket.STATUS_CHOICES]
charttype = 'bar'
elif report == 'usermonth':
@ -1037,13 +1037,13 @@ def run_report(request, report):
elif report == 'queuepriority':
title = _('Queue by Priority')
col1heading = _('Queue')
possible_options = [t[1].__str__() for t in Ticket.PRIORITY_CHOICES]
possible_options = [t[1].title() for t in Ticket.PRIORITY_CHOICES]
charttype = 'bar'
elif report == 'queuestatus':
title = _('Queue by Status')
col1heading = _('Queue')
possible_options = [s[1].__str__() for s in Ticket.STATUS_CHOICES]
possible_options = [s[1].title() for s in Ticket.STATUS_CHOICES]
charttype = 'bar'
elif report == 'queuemonth':