forked from extern/django-helpdesk
* Fixed issue #27 (e-mails not deleted)
* Fixed issue #28 (add quick delete link to dashboard)
This commit is contained in:
parent
e05bd28f8b
commit
8948bc1a0a
@ -263,7 +263,7 @@ def ticket_from_message(message, queue):
|
|||||||
a.save()
|
a.save()
|
||||||
print " - %s" % file['filename']
|
print " - %s" % file['filename']
|
||||||
|
|
||||||
return ticket
|
return t
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
<th><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></th>
|
<th><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></th>
|
||||||
<td>{{ ticket.queue }}</td>
|
<td>{{ ticket.queue }}</td>
|
||||||
<td><span title='{{ ticket.created|date:"r" }}'>{{ ticket.created|timesince }} ago</span></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>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% if not unassigned_tickets %}
|
{% if not unassigned_tickets %}
|
||||||
|
@ -153,7 +153,7 @@ def update_ticket(request, ticket_id):
|
|||||||
reassigned = False
|
reassigned = False
|
||||||
|
|
||||||
if owner:
|
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)
|
new_user = User.objects.get(id=owner)
|
||||||
f.title = _('Assigned to %(username)s') % {
|
f.title = _('Assigned to %(username)s') % {
|
||||||
'username': new_user.username,
|
'username': new_user.username,
|
||||||
|
Loading…
Reference in New Issue
Block a user