github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7394 from jumpserver/pr@dev@ticket_filter_bug 

perf: ticket filter
pull/7397/head
feng626 2021-12-15 14:40:28 +08:00 committed by GitHub
parent 27588f48d8 e4178849ba
commit facc231e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tickets/filters.py
View File

@ -10,7 +10,7 @@ class TicketFilter(BaseFilterSet):
class Meta: class Meta:
model = Ticket model = Ticket
fields = ( fields = (
'id', 'title', 'type', 'status', 'applicant', 'assignees__id', 'id', 'title', 'type', 'status', 'state', 'applicant', 'assignees__id',
'applicant_display', 'applicant_display',
) )

2
apps/tickets/handler/base.py
View File

@ -29,9 +29,9 @@ class BaseHandler(object):
self._send_applied_mail_to_assignees() self._send_applied_mail_to_assignees()
is_finished = False is_finished = False
else: else:
self._send_processed_mail_to_applicant(self.ticket.processor)
self.ticket.set_state_approve() self.ticket.set_state_approve()
self.ticket.set_status_closed() self.ticket.set_status_closed()
self._send_processed_mail_to_applicant(self.ticket.processor)
is_finished = True is_finished = True
self.ticket.save() self.ticket.save()