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

Unable to accept resolution of unassigned tickets

Browse Source
This commit is contained in:
Ross Poulton 2012-08-07 20:25:21 +10:00
parent 5640e8490c
commit 51fdee91ed
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helpdesk/views/staff.py
View File

@ -248,7 +248,7 @@ def update_ticket(request, ticket_id, public=False):
new_status = int(request.POST.get('new_status', ticket.status)) new_status = int(request.POST.get('new_status', ticket.status))
title = request.POST.get('title', '') title = request.POST.get('title', '')
public = request.POST.get('public', False) public = request.POST.get('public', False)
owner = int(request.POST.get('owner', None)) owner = int(request.POST.get('owner', -1))
priority = int(request.POST.get('priority', ticket.priority)) priority = int(request.POST.get('priority', ticket.priority))
due_date_year = int(request.POST.get('due_date_year', 0)) due_date_year = int(request.POST.get('due_date_year', 0))
due_date_month = int(request.POST.get('due_date_month', 0)) due_date_month = int(request.POST.get('due_date_month', 0))
@ -274,7 +274,7 @@ def update_ticket(request, ticket_id, public=False):
# to be closed with an {% endif %} tag. # to be closed with an {% endif %} tag.
comment = loader.get_template_from_string(comment).render(Context(context)) comment = loader.get_template_from_string(comment).render(Context(context))
if owner is None and ticket.assigned_to: if owner is -1 and ticket.assigned_to:
owner = ticket.assigned_to.id owner = ticket.assigned_to.id
f = FollowUp(ticket=ticket, date=datetime.now(), comment=comment) f = FollowUp(ticket=ticket, date=datetime.now(), comment=comment)
@ -286,7 +286,7 @@ def update_ticket(request, ticket_id, public=False):
reassigned = False reassigned = False
if owner is not None: if owner is not -1:
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') % {
@ -378,7 +378,8 @@ def update_ticket(request, ticket_id, public=False):
ticket.tags = tags ticket.tags = tags
if new_status in [ Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS ]: if new_status in [ Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS ]:
ticket.resolution = comment if new_status == Ticket.RESOLVED_STATUS or ticket.resolution is None:
ticket.resolution = comment
messages_sent_to = [] messages_sent_to = []