extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-20 17:47:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

merging with upstream.

Browse Source
This commit is contained in:
Andreas Kotowicz 2012-03-12 15:03:04 +01:00
parent ffcd404b33
commit 36471cd868
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helpdesk/views/staff.py
View File

@ -246,20 +246,15 @@ def view_ticket(request, ticket_id):
return update_ticket(request, ticket_id) return update_ticket(request, ticket_id)
<<<<<<< HEAD
ticketcc_string, SHOW_SUBSCRIBE = return_ticketccstring_and_show_subscribe(request.user, ticket)
=======
if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS: if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS:
users = User.objects.filter(is_active=True, is_staff=True).order_by('username') users = User.objects.filter(is_active=True, is_staff=True).order_by('username')
else: else:
users = User.objects.filter(is_active=True).order_by('username') users = User.objects.filter(is_active=True).order_by('username')
# TODO: shouldn't this template get a form to begin with? # TODO: shouldn't this template get a form to begin with?
form = TicketForm(initial={'due_date':ticket.due_date}) form = TicketForm(initial={'due_date':ticket.due_date})
>>>>>>> upstream/master ticketcc_string, SHOW_SUBSCRIBE = return_ticketccstring_and_show_subscribe(request.user, ticket)
return render_to_response('helpdesk/ticket.html', return render_to_response('helpdesk/ticket.html',
RequestContext(request, { RequestContext(request, {
'ticket': ticket, 'ticket': ticket,
@ -472,11 +467,7 @@ def update_ticket(request, ticket_id, public=False):
c.save() c.save()
ticket.tags = tags ticket.tags = tags
<<<<<<< HEAD
if new_status in [Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS]: if new_status in [Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS]:
=======
if new_status in [ Ticket.RESOLVED_STATUS, Ticket.CLOSED_STATUS ]:
>>>>>>> upstream/master
ticket.resolution = comment ticket.resolution = comment
messages_sent_to = [] messages_sent_to = []