diff --git a/helpdesk/settings.py b/helpdesk/settings.py index d4c5bd7e..8c4d2b2e 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -122,9 +122,6 @@ HELPDESK_CREATE_TICKET_HIDE_ASSIGNED_TO = getattr(settings, 'HELPDESK_CREATE_TIC ''' options for dashboard ''' -# hide empty queues in dashboard overview? -HELPDESK_DASHBOARD_HIDE_EMPTY_QUEUES = getattr(settings, 'HELPDESK_DASHBOARD_HIDE_EMPTY_QUEUES', True) - # show basic ticket stats on dashboard? HELPDESK_DASHBOARD_BASIC_TICKET_STATS = getattr(settings, 'HELPDESK_DASHBOARD_BASIC_TICKET_STATS', False) diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index 8889e4ac..3e75b49e 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -94,33 +94,18 @@ def dashboard(request): # Queue 2 4 12 cursor = connection.cursor() - if helpdesk_settings.HELPDESK_DASHBOARD_HIDE_EMPTY_QUEUES: - cursor.execute(""" - SELECT q.id as queue, - q.title AS name, - COUNT(CASE t.status WHEN '1' THEN t.id WHEN '2' THEN t.id END) AS open, - COUNT(CASE t.status WHEN '3' THEN t.id END) AS resolved, - COUNT(CASE t.status WHEN '4' THEN t.id END) AS closed - FROM helpdesk_ticket t, - helpdesk_queue q - WHERE q.id = t.queue_id - GROUP BY queue, name - ORDER BY q.id; - """) - else: - cursor.execute(""" - SELECT q.id as queue, - q.title AS name, - COUNT(CASE t.status WHEN '1' THEN t.id WHEN '2' THEN t.id END) AS open, - COUNT(CASE t.status WHEN '3' THEN t.id END) AS resolved, - COUNT(CASE t.status WHEN '4' THEN t.id END) AS closed - FROM helpdesk_queue q - LEFT OUTER JOIN helpdesk_ticket t - ON q.id = t.queue_id - GROUP BY queue, name - ORDER BY q.id; - """) - + cursor.execute(""" + SELECT q.id as queue, + q.title AS name, + COUNT(CASE t.status WHEN '1' THEN t.id WHEN '2' THEN t.id END) AS open, + COUNT(CASE t.status WHEN '3' THEN t.id END) AS resolved, + COUNT(CASE t.status WHEN '4' THEN t.id END) AS closed + FROM helpdesk_ticket t, + helpdesk_queue q + WHERE q.id = t.queue_id + GROUP BY queue, name + ORDER BY q.id; + """) dash_tickets = query_to_dict(cursor.fetchall(), cursor.description)