Merge 0.2.7 bugfixes

helpdesk/views/public.py

@@ -7,11 +7,17 @@ views/public.py - All public facing views, eg non-staff (no authentication
                   required) views.
 """
 from django.core.exceptions import ObjectDoesNotExist
-from django.urls import reverse
-from django.http import HttpResponseRedirect
+try:
+    # Django 2.0+
+    from django.urls import reverse
+except ImportError:
+    # Django < 2
+    from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render
 from django.utils.http import urlquote
 from django.utils.translation import ugettext as _
+from django.conf import settings
 
 from helpdesk import settings as helpdesk_settings
 from helpdesk.decorators import protect_view, is_helpdesk_staff
@@ -61,6 +67,19 @@ def homepage(request):
         except Queue.DoesNotExist:
             queue = None
         initial_data = {}
+
+        # add pre-defined data for public ticket
+        if hasattr(settings, 'HELPDESK_PUBLIC_TICKET_QUEUE'):
+            # get the requested queue; return an error if queue not found
+            try:
+                queue = Queue.objects.get(slug=settings.HELPDESK_PUBLIC_TICKET_QUEUE)
+            except Queue.DoesNotExist:
+                return HttpResponse(status=500)
+        if hasattr(settings, 'HELPDESK_PUBLIC_TICKET_PRIORITY'):
+            initial_data['priority'] = settings.HELPDESK_PUBLIC_TICKET_PRIORITY
+        if hasattr(settings, 'HELPDESK_PUBLIC_TICKET_DUE_DATE'):
+            initial_data['due_date'] = settings.HELPDESK_PUBLIC_TICKET_DUE_DATE
+
         if queue:
             initial_data['queue'] = queue.id
 
@@ -91,6 +110,8 @@ def view_ticket(request):
             ticket = Ticket.objects.get(id=ticket_id, submitter_email__iexact=email)
         except ObjectDoesNotExist:
             error_message = _('Invalid ticket ID or e-mail address. Please try again.')
+        except ValueError:
+            error_message = _('Invalid ticket ID or e-mail address. Please try again.')
         else:
             if is_helpdesk_staff(request.user):
                 redirect_url = reverse('helpdesk:view', args=[ticket_id])