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

Merge pull request #506 from willstott101/patch-1

Browse Source 
Never return None from views.public.create_ticket
This commit is contained in:
Garret Wassermann 2017-04-13 21:59:34 -04:00 committed by GitHub
commit bb59de037d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helpdesk/views/public.py
View File

@ -75,8 +75,8 @@ def homepage(request):
def view_ticket(request): def view_ticket(request):
ticket_req = request.GET.get('ticket', '') ticket_req = request.GET.get('ticket', None)
email = request.GET.get('email', '') email = request.GET.get('email', None)
if ticket_req and email: if ticket_req and email:
queue, ticket_id = Ticket.queue_and_id_from_query(ticket_req) queue, ticket_id = Ticket.queue_and_id_from_query(ticket_req)
@ -84,13 +84,6 @@ def view_ticket(request):
ticket = Ticket.objects.get(id=ticket_id, submitter_email__iexact=email) ticket = Ticket.objects.get(id=ticket_id, submitter_email__iexact=email)
except ObjectDoesNotExist: except ObjectDoesNotExist:
error_message = _('Invalid ticket ID or e-mail address. Please try again.') error_message = _('Invalid ticket ID or e-mail address. Please try again.')
return render(request, 'helpdesk/public_view_form.html', {
'ticket': False,
'email': email,
'error_message': error_message,
'helpdesk_settings': helpdesk_settings,
})
else: else:
if request.user.is_staff: if request.user.is_staff:
redirect_url = reverse('helpdesk:view', args=[ticket_id]) redirect_url = reverse('helpdesk:view', args=[ticket_id])
@ -124,6 +117,17 @@ def view_ticket(request):
'helpdesk_settings': helpdesk_settings, 'helpdesk_settings': helpdesk_settings,
'next': redirect_url, 'next': redirect_url,
}) })
elif ticket_req is None and email is None:
error_message = None
else:
error_message = _('Missing ticket ID or e-mail address. Please try again.')
return render(request, 'helpdesk/public_view_form.html', {
'ticket': False,
'email': email,
'error_message': error_message,
'helpdesk_settings': helpdesk_settings,
})
def change_language(request): def change_language(request):