extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-05-30 06:29:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Never return None from views.public.create_ticket

Browse Source 
Would create a 500 when user omitted their email. Only a partial improve. Added a TODO: as this view still breaks if passing non-numeric characters to the ID.

I assume this needs a full overhaul really.
This commit is contained in:
Will Stott 2017-04-13 11:30:29 +01:00 committed by GitHub
parent c8935eeb63
commit b7a97183cb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
helpdesk/views/public.py
View File

@ -75,6 +75,7 @@ def homepage(request):
def view_ticket(request): def view_ticket(request):
# TODO: Use a form here, not enough validation on these parameters.
ticket_req = request.GET.get('ticket', '') ticket_req = request.GET.get('ticket', '')
email = request.GET.get('email', '') email = request.GET.get('email', '')
@ -84,13 +85,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 +118,15 @@ def view_ticket(request):
'helpdesk_settings': helpdesk_settings, 'helpdesk_settings': helpdesk_settings,
'next': redirect_url, 'next': redirect_url,
}) })
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):