Merge pull request #149

feat(project): change hard project  delete to logic delete lihuacai A minute ago

fastrunner/models.py

@@ -34,6 +34,7 @@ class Meta:
     jira_bearer_token = models.CharField(
         "jira bearer_token", null=False, default="", max_length=45, blank=True
     )
+    is_deleted = models.IntegerField("是否删除", null=True, default=0)
 
 
 class Debugtalk(BaseTable):

fastrunner/views/project.py

@@ -24,7 +24,7 @@ class ProjectView(GenericViewSet):
     项目增删改查
     """
 
-    queryset = models.Project.objects.all().order_by("-update_time")
+    queryset = models.Project.objects.filter(is_deleted=0).all().order_by("-update_time")
     serializer_class = serializers.ProjectSerializer
     pagination_class = pagination.MyCursorPagination
 
@@ -97,9 +97,10 @@ def delete(self, request):
             return Response(status=status.HTTP_401_UNAUTHORIZED)
         try:
             project = models.Project.objects.get(id=request.data["id"])
-
-            project.delete()
-            prepare.project_end(project)
+            # 改完软删除
+            project.is_deleted = 1
+            project.save(update_fields=['is_deleted'])
+            # prepare.project_end(project)
 
             return Response(response.PROJECT_DELETE_SUCCESS)
         except ObjectDoesNotExist:

web/src/pages/project/ProjectList.vue

@@ -184,7 +184,6 @@
                             <el-button
                                 size="medium"
                                 type="danger"
-                                v-show="false"
                                 :title="isSuperuser ? '删除项目' : '权限不足，请联系管理员'"
                                 :disabled="!isSuperuser"
                                 @click="handleDelete(scope.$index, scope.row)"