github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 19:38:07 +00:00
Code Issues Projects Releases Wiki Activity

feat: 工单多级审批 + 模版创建 (#6640)

Browse Source 
* feat: 工单多级审批 + 模版创建

* feat: 工单权限处理

* fix: 工单关闭后 再审批bug

* perf: 修改一点

Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2021-08-25 19:02:50 +08:00
committed by GitHub
parent 1fdc558ef7
commit 0f87f05b3f
30 changed files with 897 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/tickets/api/common.py
View File

@@ -15,16 +15,16 @@ class GenericTicketStatusRetrieveCloseAPI(RetrieveDestroyAPIView):
permission_classes = (IsAppUser, )
def retrieve(self, request, *args, **kwargs):
if self.ticket.action_open:
if self.ticket.state_open:
status = 'await'
elif self.ticket.action_approve:
status = 'approve'
elif self.ticket.state_approve:
status = 'approved'
else:
status = 'reject'
status = 'rejected'
data = {
'status': status,
'action': self.ticket.action,
'processor': self.ticket.processor_display
'action': self.ticket.state,
'processor': str(self.ticket.processor)
}
return Response(data=data, status=200)
@@ -32,9 +32,9 @@ class GenericTicketStatusRetrieveCloseAPI(RetrieveDestroyAPIView):
if self.ticket.status_open:
self.ticket.close(processor=self.ticket.applicant)
data = {
'action': self.ticket.action,
'action': self.ticket.state,
'status': self.ticket.status,
'processor': self.ticket.processor_display
'processor': str(self.ticket.processor)
}
return Response(data=data, status=200)