From 2f4d91c22db65878d70f69cd2ef3db43175fd33e Mon Sep 17 00:00:00 2001 From: Andrew Denisenko Date: Tue, 3 Mar 2020 23:39:02 +0200 Subject: [PATCH 1/2] Fill followup user field if authenticated user submits ticket --- helpdesk/forms.py | 7 ++-- helpdesk/tests/test_ticket_submission.py | 44 ++++++++++++++++++++++++ helpdesk/views/public.py | 3 +- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/helpdesk/forms.py b/helpdesk/forms.py index e9d4ef64..9ba3e461 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -318,7 +318,7 @@ class TicketForm(AbstractTicketForm): super(TicketForm, self).__init__(*args, **kwargs) self._add_form_custom_fields() - def save(self, user=None): + def save(self, user): """ Writes and returns a Ticket() object """ @@ -378,7 +378,7 @@ class PublicTicketForm(AbstractTicketForm): self._add_form_custom_fields(False) - def save(self): + def save(self, user): """ Writes and returns a Ticket() object """ @@ -389,7 +389,8 @@ class PublicTicketForm(AbstractTicketForm): self._create_custom_fields(ticket) - followup = self._create_follow_up(ticket, title=_('Ticket Opened Via Web')) + followup = self._create_follow_up( + ticket, title=_('Ticket Opened Via Web'), user=user) followup.save() files = self._attach_files_to_follow_up(followup) diff --git a/helpdesk/tests/test_ticket_submission.py b/helpdesk/tests/test_ticket_submission.py index e21cd4fb..316b8e64 100644 --- a/helpdesk/tests/test_ticket_submission.py +++ b/helpdesk/tests/test_ticket_submission.py @@ -1,5 +1,6 @@ from helpdesk.models import Queue, CustomField, Ticket from django.test import TestCase +from django.contrib.auth import get_user_model from django.core import mail from django.test.client import Client from django.urls import reverse @@ -32,6 +33,10 @@ class TicketBasicsTestCase(TestCase): 'description': 'Some Test Ticket', } + self.user = get_user_model().objects.create( + username='User_1', + ) + self.client = Client() def test_create_ticket_direct(self): @@ -69,6 +74,45 @@ class TicketBasicsTestCase(TestCase): # Ensure submitter, new-queue + update-queue were all emailed. self.assertEqual(email_count + 3, len(mail.outbox)) + ticket = Ticket.objects.last() + self.assertEqual(ticket.followup_set.count(), 1) + # Follow up is anonymous + self.assertIsNone(ticket.followup_set.first().user) + + def test_create_ticket_authorized(self): + email_count = len(mail.outbox) + self.client.force_login(self.user) + + response = self.client.get(reverse('helpdesk:home')) + self.assertEqual(response.status_code, 200) + + post_data = { + 'title': 'Test ticket title', + 'queue': self.queue_public.id, + 'submitter_email': 'ticket1.submitter@example.com', + 'body': 'Test ticket body', + 'priority': 3, + } + + response = self.client.post(reverse('helpdesk:home'), post_data, follow=True) + last_redirect = response.redirect_chain[-1] + last_redirect_url = last_redirect[0] + # last_redirect_status = last_redirect[1] + + # Ensure we landed on the "View" page. + # Django 1.9 compatible way of testing this + # https://docs.djangoproject.com/en/1.9/releases/1.9/#http-redirects-no-longer-forced-to-absolute-uris + urlparts = urlparse(last_redirect_url) + self.assertEqual(urlparts.path, reverse('helpdesk:public_view')) + + # Ensure submitter, new-queue + update-queue were all emailed. + self.assertEqual(email_count + 3, len(mail.outbox)) + + ticket = Ticket.objects.last() + self.assertEqual(ticket.followup_set.count(), 1) + # Follow up is for registered user + self.assertEqual(ticket.followup_set.first().user, self.user) + def test_create_ticket_private(self): email_count = len(mail.outbox) post_data = { diff --git a/helpdesk/views/public.py b/helpdesk/views/public.py index 86166e79..b5338d65 100644 --- a/helpdesk/views/public.py +++ b/helpdesk/views/public.py @@ -48,7 +48,8 @@ def homepage(request): # This submission is spam. Let's not save it. return render(request, template_name='helpdesk/public_spam.html') else: - ticket = form.save() + ticket = form.save( + user=request.user if request.user.is_authenticated else None) try: return HttpResponseRedirect('%s?ticket=%s&email=%s' % ( reverse('helpdesk:public_view'), From 2041430cd3577ef864723134972628ec648548fc Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Wed, 15 Apr 2020 06:59:06 -0400 Subject: [PATCH 2/2] Update to 0.2.21 --- demo/setup.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/setup.py b/demo/setup.py index 163d2e66..d5c9bbc0 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -13,7 +13,7 @@ project_root = os.path.dirname(here) NAME = 'django-helpdesk-demodesk' DESCRIPTION = 'A demo Django project using django-helpdesk' README = open(os.path.join(here, 'README.rst')).read() -VERSION = '0.2.20' +VERSION = '0.2.21' #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() AUTHOR = 'django-helpdesk team' URL = 'https://github.com/django-helpdesk/django-helpdesk' diff --git a/setup.py b/setup.py index 89162afa..d9f26d2f 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.2.20' +version = '0.2.21' # Provided as an attribute, so you can append to these instead # of replicating them: