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

merge v3

Browse Source
This commit is contained in:
feng626
2022-08-29 19:53:04 +08:00
parent 3e1c832964 60cb1f8136
commit ca3d2271a8
138 changed files with 4665 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tickets/api/super_ticket.py
View File

@@ -20,4 +20,4 @@ class SuperTicketStatusAPI(RetrieveDestroyAPIView):
return Ticket.objects.all()
def perform_destroy(self, instance):
instance.close(processor=instance.applicant)
instance.close()

6
apps/tickets/api/ticket.py
View File

@@ -30,7 +30,8 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
serializer_class = serializers.TicketDisplaySerializer
serializer_classes = {
'list': serializers.TicketListSerializer,
'open': serializers.TicketApplySerializer
'open': serializers.TicketApplySerializer,
'approve': serializers.TicketApproveSerializer
}
model = Ticket
perm_model = Ticket
@@ -77,7 +78,8 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
partial = kwargs.pop('partial', False)
instance = self.get_object()
serializer = self.get_serializer(instance, data=request.data, partial=partial)
serializer.is_valid(raise_exception=True)
with tmp_to_root_org():
serializer.is_valid(raise_exception=True)
instance = serializer.save()
instance.approve(processor=request.user)
return Response('ok')