From 172f7bae6c901ca869b4042b827babc7eb5f9abc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 18 Aug 2021 14:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/wf/models.py | 1 - hb_server/apps/wf/views.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hb_server/apps/wf/models.py b/hb_server/apps/wf/models.py index caadf32..4482162 100644 --- a/hb_server/apps/wf/models.py +++ b/hb_server/apps/wf/models.py @@ -45,7 +45,6 @@ class State(BaseModel): sort = models.IntegerField('状态顺序', default=0, help_text='用于工单步骤接口时，step上状态的顺序(因为存在网状情况，所以需要人为设定顺序),值越小越靠前') type = models.IntegerField('状态类型', default=0, choices=type_choices, help_text='0.普通类型 1.初始状态(用于新建工单时,获取对应的字段必填及transition信息) 2.结束状态(此状态下的工单不得再处理，即没有对应的transition)') enable_retreat = models.BooleanField('允许撤回', default=False, help_text='开启后允许工单创建人在此状态直接撤回工单到初始状态') - participant_type = models.IntegerField('参与者类型', default=1, blank=True, help_text='0.无处理人,1.个人,2.多人,3.部门,4.角色,5.变量(支持工单创建人,创建人的leader),6.脚本,7.工单的字段内容(如表单中的"测试负责人"，需要为用户名或者逗号隔开的多个用户名),8.父工单的字段内容。 初始状态请选择类型5，参与人填creator') diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py index d9263e1..8a3210b 100644 --- a/hb_server/apps/wf/views.py +++ b/hb_server/apps/wf/views.py @@ -1,6 +1,6 @@ from rest_framework.response import Response from rest_framework import serializers -from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, UpdateModelMixin +from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, RetrieveModelMixin, UpdateModelMixin from apps.wf.serializers import CustomFieldSerializer, StateSerializer, TransitionSerializer, WorkflowSerializer from django.shortcuts import render from rest_framework.viewsets import GenericViewSet, ModelViewSet @@ -47,7 +47,7 @@ class WorkflowViewSet(CreateUpdateModelAMixin, ModelViewSet): serializer = self.serializer_class(instance=CustomField.objects.filter(workflow=wf), many=True) return Response(serializer.data) -class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = State.objects.all() serializer_class = StateSerializer @@ -55,7 +55,7 @@ class StateViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, Gener filterset_fields = ['workflow'] ordering = ['sort'] -class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = Transition.objects.all() serializer_class = TransitionSerializer @@ -63,7 +63,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, filterset_fields = ['workflow', 'state'] ordering = ['id'] -class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet): +class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet): perms_map = {'*':'*'} queryset = CustomField.objects.all() serializer_class = CustomFieldSerializer