holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed issue #27 (e-mails not deleted)

Browse Source 
* Fixed issue #28 (add quick delete link to dashboard)
This commit is contained in:
Ross Poulton 2008-11-09 05:34:51 +00:00
parent e05bd28f8b
commit 8948bc1a0a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/commands/get_email.py
View File

@ -263,7 +263,7 @@ def ticket_from_message(message, queue):
a.save()
print " - %s" % file['filename']
return ticket
return t
if __name__ == '__main__':

2
templates/helpdesk/dashboard.html
View File

@ -49,7 +49,7 @@
<th><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></th>
<td>{{ ticket.queue }}</td>
<td><span title='{{ ticket.created|date:"r" }}'>{{ ticket.created|timesince }} ago</span></td>
<th><a href='{{ ticket.get_absolute_url }}?take'><span class='button button_take'>{% trans "Take" %}</span></a></th>
<th><a href='{{ ticket.get_absolute_url }}?take'><span class='button button_take'>{% trans "Take" %}</span></a> | <a href='{% url helpdesk_delete ticket.id %}'><span class='button button_delete'>{% trans "Delete" %}</span></a></th>
</tr>
{% endfor %}
{% if not unassigned_tickets %}

2
views/staff.py
View File

@ -153,7 +153,7 @@ def update_ticket(request, ticket_id):
reassigned = False
if owner:
if owner != 0 and (ticket.assigned_to and owner != ticket.assigned_to.id) or not ticket.assigned_to:
if owner != 0 and ((ticket.assigned_to and owner != ticket.assigned_to.id) or not ticket.assigned_to):
new_user = User.objects.get(id=owner)
f.title = _('Assigned to %(username)s') % {
'username': new_user.username,