From 5ff9025cc8de55341c316a91d224f0b9abaf2b6f Mon Sep 17 00:00:00 2001 From: Ross Poulton Date: Tue, 18 Nov 2008 04:30:34 +0000 Subject: [PATCH] * Fix issues #30 and #31: * Dashboard doesn't show "You have no tickets assigned to you." incorrectly * get_email is smarter about "RE:" and "FW:" to prevent double-ups. --- management/commands/get_email.py | 2 +- templates/helpdesk/dashboard.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/management/commands/get_email.py b/management/commands/get_email.py index 281e6ae2..b1dd527d 100644 --- a/management/commands/get_email.py +++ b/management/commands/get_email.py @@ -122,7 +122,7 @@ def ticket_from_message(message, queue): message = email.message_from_string(msg) subject = message.get('subject', _('Created from e-mail')) subject = decodeUnknown(message.get_charset(), subject) - subject = subject.replace("Re: ", "").replace("Fw: ", "").strip() + subject = subject.replace("Re: ", "").replace("Fw: ", "").replace("RE: ", "").replace("FW: ", "").strip() sender = message.get('from', _('Unknown Sender')) sender = decodeUnknown(message.get_charset(), sender) diff --git a/templates/helpdesk/dashboard.html b/templates/helpdesk/dashboard.html index 278f00ba..0e80f74d 100644 --- a/templates/helpdesk/dashboard.html +++ b/templates/helpdesk/dashboard.html @@ -34,7 +34,7 @@ {{ ticket.modified|timesince }} {% endfor %} -{% if not unassigned_tickets %} +{% if not user_tickets %} {% trans "You have no tickets assigned to you." %} {% endif %}