zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作流自定义字段排序

This commit is contained in:
caoqianming 2021-12-22 10:37:24 +08:00
parent 5fed3d5ad8
commit 72e5d89cac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hb_server/apps/wf/views.py
View File

@ -105,7 +105,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin,
class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet):
perms_map = {'*':'*'} perms_map = {'*':'*'}
queryset = CustomField.objects.all() queryset = CustomField.objects.all().order_by('sort')
serializer_class = CustomFieldSerializer serializer_class = CustomFieldSerializer
search_fields = ['field_name'] search_fields = ['field_name']
filterset_fields = ['workflow', 'field_type'] filterset_fields = ['workflow', 'field_type']
@ -205,7 +205,7 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
vdata = serializer.validated_data vdata = serializer.validated_data
new_ticket_data = ticket.ticket_data new_ticket_data = ticket.ticket_data
new_ticket_data.update(**vdata['ticket_data']) new_ticket_data.update(**vdata['ticket_data'])
ticket = WfService.handle_ticket(ticket=ticket, transition=vdata['transition'], ticket = WfService.handle_ticket(ticket=ticket, transition=vdata['transition'],
new_ticket_data=new_ticket_data, handler=request.user, suggestion=vdata['suggestion']) new_ticket_data=new_ticket_data, handler=request.user, suggestion=vdata['suggestion'])
return Response(TicketSerializer(instance=ticket).data) return Response(TicketSerializer(instance=ticket).data)