diff --git a/apps/tickets/handler/apply_application.py b/apps/tickets/handler/apply_application.py index 9a504f39f..5cfc06e38 100644 --- a/apps/tickets/handler/apply_application.py +++ b/apps/tickets/handler/apply_application.py @@ -84,7 +84,7 @@ class Handler(BaseHandler): ).format( self.ticket.title, self.ticket.applicant_display, - str(self.ticket.processor), + ','.join([i['processor_display'] for i in self.ticket.process_map]), str(self.ticket.id) ) permissions_data = { diff --git a/apps/tickets/handler/apply_asset.py b/apps/tickets/handler/apply_asset.py index 883c7f45b..f457efdba 100644 --- a/apps/tickets/handler/apply_asset.py +++ b/apps/tickets/handler/apply_asset.py @@ -77,7 +77,7 @@ class Handler(BaseHandler): ).format( self.ticket.title, self.ticket.applicant_display, - str(self.ticket.processor), + ','.join([i['processor_display'] for i in self.ticket.process_map]), str(self.ticket.id) ) diff --git a/apps/tickets/handler/base.py b/apps/tickets/handler/base.py index 2bd674b0e..5e13b7a60 100644 --- a/apps/tickets/handler/base.py +++ b/apps/tickets/handler/base.py @@ -23,16 +23,18 @@ class BaseHandler(object): def _on_approve(self): if self.ticket.approval_step != len(self.ticket.process_map): + self._send_processed_mail_to_applicant(self.ticket.processor) self.ticket.approval_step += 1 self.ticket.create_related_node() self._send_applied_mail_to_assignees() is_finished = False else: + self._send_processed_mail_to_applicant(self.ticket.processor) self.ticket.set_state_approve() self.ticket.set_status_closed() is_finished = True - self.__on_process(self.ticket.processor) + self.ticket.save() return is_finished def _on_reject(self):