holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2025-02-18 03:00:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Garret Wassermann 2018-02-07 02:16:41 -05:00
commit 0bddf819f7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpdesk/management/commands/get_email.py
View File

@ -462,7 +462,7 @@ def ticket_from_message(message, queue, logger):
for ccemail in new_cc: for ccemail in new_cc:
tcc = TicketCC.objects.create( tcc = TicketCC.objects.create(
ticket=t, ticket=t,
email=ccemail, email=ccemail.replace('\n', ' ').replace('\r', ' '),
can_view=True, can_view=True,
can_update=False can_update=False
) )

2
helpdesk/views/public.py
View File

@ -102,6 +102,8 @@ 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.')
except ValueError:
error_message = _('Invalid ticket ID or e-mail address. Please try again.')
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])