From 66da47205e69e8f13c01d74b065c09b185d37838 Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Wed, 29 Jan 2014 22:13:42 +1100 Subject: [PATCH] settings.py cleanup (#200) - remove HELPDESK_DASHBOARD_BASIC_TICKET_STATS, always shows now. This resolves #201 to my satisfaction for now. --- helpdesk/settings.py | 7 ------- helpdesk/templates/helpdesk/dashboard.html | 2 -- helpdesk/views/staff.py | 5 +---- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/helpdesk/settings.py b/helpdesk/settings.py index 8c4d2b2e..45a109ae 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -121,13 +121,6 @@ HELPDESK_CREATE_TICKET_HIDE_ASSIGNED_TO = getattr(settings, 'HELPDESK_CREATE_TIC -''' options for dashboard ''' -# show basic ticket stats on dashboard? -HELPDESK_DASHBOARD_BASIC_TICKET_STATS = getattr(settings, 'HELPDESK_DASHBOARD_BASIC_TICKET_STATS', False) - - - - ''' options for footer ''' # show 'API' link at bottom of page HELPDESK_FOOTER_SHOW_API_LINK = getattr(settings, 'HELPDESK_FOOTER_SHOW_API_LINK', True) diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html index fdc524ef..a10c2756 100644 --- a/helpdesk/templates/helpdesk/dashboard.html +++ b/helpdesk/templates/helpdesk/dashboard.html @@ -33,7 +33,6 @@ -{% if helpdesk_settings.HELPDESK_DASHBOARD_BASIC_TICKET_STATS %}
@@ -54,7 +53,6 @@ {% endfor %}
-{% endif %} {% if all_tickets_reported_by_current_user %} diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index 3e75b49e..94018a28 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -82,10 +82,7 @@ def dashboard(request): submitter_email=email_current_user, ).order_by('status') - # calculate basic ticket stats if requested - basic_ticket_stats = False - if helpdesk_settings.HELPDESK_DASHBOARD_BASIC_TICKET_STATS: - basic_ticket_stats = calc_basic_ticket_stats(Ticket) + basic_ticket_stats = calc_basic_ticket_stats(Ticket) # The following query builds a grid of queues & ticket statuses, # to be displayed to the user. EG: