diff --git a/helpdesk/forms.py b/helpdesk/forms.py index b1f67c99..dd30d259 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -221,7 +221,7 @@ class EditTicketCustomFieldForm(EditTicketForm): for field, value in self.cleaned_data.items(): if field.startswith("custom_"): if value != self.fields[field].initial: - c = followup.ticketchange_set.create( + followup.ticketchange_set.create( field=field.replace("custom_", "", 1), old_value=self.fields[field].initial, new_value=value, diff --git a/helpdesk/query.py b/helpdesk/query.py index af205739..e2681927 100644 --- a/helpdesk/query.py +++ b/helpdesk/query.py @@ -40,18 +40,17 @@ def get_search_filter_args(search): subsearch = subsearch.strip() if not subsearch: continue - my_filter = ( - filter - | Q(id__icontains=subsearch) - | Q(title__icontains=subsearch) - | Q(description__icontains=subsearch) - | Q(priority__icontains=subsearch) - | Q(resolution__icontains=subsearch) - | Q(submitter_email__icontains=subsearch) - | Q(assigned_to__email__icontains=subsearch) - | Q(ticketcustomfieldvalue__value__icontains=subsearch) - | Q(created__icontains=subsearch) - | Q(due_date__icontains=subsearch) + my_filter |= ( + Q(id__icontains=subsearch) | + Q(title__icontains=subsearch) | + Q(description__icontains=subsearch) | + Q(priority__icontains=subsearch) | + Q(resolution__icontains=subsearch) | + Q(submitter_email__icontains=subsearch) | + Q(assigned_to__email__icontains=subsearch) | + Q(ticketcustomfieldvalue__value__icontains=subsearch) | + Q(created__icontains=subsearch) | + Q(due_date__icontains=subsearch) ) return my_filter diff --git a/helpdesk/tests/test_api.py b/helpdesk/tests/test_api.py index 518ae744..4b7de7a9 100644 --- a/helpdesk/tests/test_api.py +++ b/helpdesk/tests/test_api.py @@ -415,7 +415,7 @@ class UserTicketTest(APITestCase): ticket_1 = Ticket.objects.create( queue=self.queue, title="Test 1", submitter_email="foo@example.com" ) - ticket_2 = Ticket.objects.create( + Ticket.objects.create( queue=self.queue, title="Test 2", submitter_email="bar@example.com" ) ticket_3 = Ticket.objects.create( @@ -432,10 +432,10 @@ class UserTicketTest(APITestCase): staff_user = User.objects.create_user( username="test2", is_staff=True, email="staff@example.com" ) - ticket_1 = Ticket.objects.create( + Ticket.objects.create( queue=self.queue, title="Test 1", submitter_email="staff@example.com" ) - ticket_2 = Ticket.objects.create( + Ticket.objects.create( queue=self.queue, title="Test 2", submitter_email="foo@example.com" ) self.client.force_authenticate(staff_user) @@ -444,7 +444,7 @@ class UserTicketTest(APITestCase): self.assertEqual(len(response.data["results"]), 1) def test_not_logged_in_user(self): - ticket_1 = Ticket.objects.create( + Ticket.objects.create( queue=self.queue, title="Test 1", submitter_email="ex@example.com" ) self.client.logout() diff --git a/helpdesk/tests/test_navigation.py b/helpdesk/tests/test_navigation.py index 031e3fd7..9c695d20 100644 --- a/helpdesk/tests/test_navigation.py +++ b/helpdesk/tests/test_navigation.py @@ -148,7 +148,7 @@ class StaffUsersOnlyTestCase(StaffUserTestCaseMixin, TestCase): """ user = self.non_staff_user self.client.login(username=user.username, password=self.non_staff_user_password) - queue = Queue.objects.create( + Queue.objects.create( title="Foo", slug="test_queue", ) @@ -217,7 +217,7 @@ class HomePageAnonymousUserTestCase(TestCase): def test_homepage(self): helpdesk_settings.HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = True - response = self.client.get(reverse("helpdesk:home")) + self.client.get(reverse("helpdesk:home")) self.assertTemplateUsed("helpdesk/public_homepage.html") def test_redirect_to_login(self): diff --git a/helpdesk/tests/test_ticket_actions.py b/helpdesk/tests/test_ticket_actions.py index 19b6fa8d..92da0b1f 100644 --- a/helpdesk/tests/test_ticket_actions.py +++ b/helpdesk/tests/test_ticket_actions.py @@ -366,7 +366,7 @@ class TicketActionsTestCase(TestCase): "comment": "first follow-up in new queue", "queue": str(new_queue.id), } - response = self.client.post( + self.client.post( reverse("helpdesk:update", kwargs={"ticket_id": ticket_id}), post_data ) diff --git a/helpdesk/tests/test_ticket_submission.py b/helpdesk/tests/test_ticket_submission.py index b644c08c..bbe37e67 100644 --- a/helpdesk/tests/test_ticket_submission.py +++ b/helpdesk/tests/test_ticket_submission.py @@ -97,8 +97,6 @@ class TicketBasicsTestCase(TestCase): self.assertIsNone(ticket.followup_set.first().user) def test_create_ticket_public_with_hidden_fields(self): - email_count = len(mail.outbox) - response = self.client.get(reverse("helpdesk:home")) self.assertEqual(response.status_code, 200) @@ -503,8 +501,6 @@ class EmailInteractionsTestCase(TestCase): msg.__setitem__("Content-Type", "text/plain;") msg.set_payload(self.ticket_data["description"]) - email_count = len(mail.outbox) - extract_email_metadata(str(msg), self.queue_public, logger=logger) followup = FollowUp.objects.get(message_id=message_id) @@ -595,8 +591,6 @@ class EmailInteractionsTestCase(TestCase): msg.__setitem__("Content-Type", "text/plain;") msg.set_payload(self.ticket_data["description"]) - email_count = len(mail.outbox) - extract_email_metadata(str(msg), self.queue_public, logger=logger) followup = FollowUp.objects.get(message_id=message_id) @@ -1044,8 +1038,6 @@ class EmailInteractionsTestCase(TestCase): msg.__setitem__("Content-Type", "text/plain;") msg.set_payload(self.ticket_data["description"]) - email_count = len(mail.outbox) - extract_email_metadata(str(msg), self.queue_public, logger=logger) followup = FollowUp.objects.get(message_id=message_id) diff --git a/helpdesk/tests/test_time_spent_auto.py b/helpdesk/tests/test_time_spent_auto.py index fc78f2df..0055b08a 100644 --- a/helpdesk/tests/test_time_spent_auto.py +++ b/helpdesk/tests/test_time_spent_auto.py @@ -428,7 +428,7 @@ class TimeSpentAutoTestCase(TestCase): "comment": "ticket in queue {}".format(queue), "queue": queues[queue].id, } - response = self.client.post( + self.client.post( reverse("helpdesk:update", kwargs={"ticket_id": ticket.id}), post_data ) latest_fup = ticket.followup_set.latest("id") diff --git a/helpdesk/tests/test_webhooks.py b/helpdesk/tests/test_webhooks.py index e10eaab9..271668ac 100644 --- a/helpdesk/tests/test_webhooks.py +++ b/helpdesk/tests/test_webhooks.py @@ -270,9 +270,6 @@ class WebhookTest(APITestCase): self.assertEqual(len(handled_webhook_requests["follow_up_requests"]), 0) ticket_id = handled_webhook_requests["new_ticket_requests"][-1]["ticket"]["id"] - from .. import models - - ticket = models.Ticket.objects.get(id=ticket_id) payload = { "body": "hello", diff --git a/helpdesk/update_ticket.py b/helpdesk/update_ticket.py index 50614a9f..ed4fabdb 100644 --- a/helpdesk/update_ticket.py +++ b/helpdesk/update_ticket.py @@ -272,7 +272,7 @@ def update_ticket( files = process_attachments(f, files) if files else [] if title and title != ticket.title: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Title"), old_value=ticket.title, new_value=title, @@ -280,21 +280,21 @@ def update_ticket( ticket.title = title if new_status != old_status: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Status"), old_value=old_status_str, new_value=ticket.get_status_display(), ) if ticket.assigned_to != old_owner: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Owner"), old_value=old_owner, new_value=ticket.assigned_to, ) if priority != ticket.priority: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Priority"), old_value=ticket.priority, new_value=priority, @@ -302,7 +302,7 @@ def update_ticket( ticket.priority = priority if queue != ticket.queue.id: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Queue"), old_value=ticket.queue.id, new_value=queue, @@ -310,7 +310,7 @@ def update_ticket( ticket.queue_id = queue if due_date != ticket.due_date: - c = f.ticketchange_set.create( + f.ticketchange_set.create( field=_("Due on"), old_value=ticket.due_date, new_value=due_date, diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index ef4e1642..108b7d35 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -637,7 +637,6 @@ def update_ticket_view(request, ticket_id, public=False): if new_checklist != old_completed: changes_in_checklists = True - time_spent = get_time_spent_from_request(request) # NOTE: jQuery's default for dates is mm/dd/yy # very US-centric but for now that's the only format supported # until we clean up code to internationalize a little more diff --git a/pyproject.toml b/pyproject.toml index cf6e1cc3..5a18348a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.ruff] [tool.ruff.lint] -ignore = ["E501", "E731", "F841", "E721"] +ignore = ["E501", "E731", "E721"]