From 2a67f37577707651afb624eb185f7abfa91841cb Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Wed, 23 Dec 2009 11:47:50 +0000 Subject: [PATCH] Issue #125: If you have no tickets, the reports throw a 500 server error. This patch removes the report links when there's no tickets in the system. Thanks to Kestutis Gustaitis for the bug report. --- CHANGELOG | 4 ++++ templates/helpdesk/report_index.html | 12 ++++++++++-- views/staff.py | 5 ++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 332cccc1..5ff67a9b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,3 +29,7 @@ volume of data in the system. This patch restricts the chart to 1000px wide. 2009-12-16 r146 Issue #121 Formatting fix for email subjects. Thanks, Andreas Kotowicz. + +2009-12-16 r147 Issue #119 Update Russian translation, thanks to Alex Yakovlev + +2009-12-23 r148 Issue #125 Errors occurring when running reports with no data diff --git a/templates/helpdesk/report_index.html b/templates/helpdesk/report_index.html index 2bd496bd..29bf56de 100644 --- a/templates/helpdesk/report_index.html +++ b/templates/helpdesk/report_index.html @@ -2,9 +2,17 @@ {% block helpdesk_title %}{% trans "Reports & Statistics" %}{% endblock %} -{% block helpdesk_body %}{% blocktrans %} +{% block helpdesk_body %} +{% ifequal num_tickets 0 %}{% blocktrans %}

Reports & Statistics

+

You haven't created any tickets yet, so you cannot run any reports.

+{% endblocktrans %} +{% else %} +{% blocktrans %} +

Reports & Statistics

+ + -{% endblocktrans %}{% endblock %} +{% endblocktrans %}{% endifequal %}{% endblock %} diff --git a/views/staff.py b/views/staff.py index 49ca90d6..ee353132 100644 --- a/views/staff.py +++ b/views/staff.py @@ -703,8 +703,11 @@ rss_list = staff_member_required(rss_list) def report_index(request): + number_tickets = Ticket.objects.all().count() return render_to_response('helpdesk/report_index.html', - RequestContext(request, {})) + RequestContext(request, { + 'number_tickets': number_tickets, + })) report_index = staff_member_required(report_index)