From 711eb6cea212af7dd46a26d7e7ea4cce123ed32f Mon Sep 17 00:00:00 2001 From: Jonathan Barratt Date: Thu, 4 Jun 2015 13:04:14 +0700 Subject: [PATCH] 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 --- helpdesk/views/staff.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index b36bd5d5..0ea21497 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -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':