From 67bbc1954134ff741772ea24976180996ca6c5e1 Mon Sep 17 00:00:00 2001
From: jerrylizilong <lizion138@163.com>
Date: Wed, 27 Mar 2019 12:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E9=9B=86=E5=8A=9F=E8=83=BD=EF=BC=88=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/db/test_task_manage.py            | 2 +-
 app/static/scripts/core/test_suite.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/db/test_task_manage.py b/app/db/test_task_manage.py
index 0f6a70b..defc492 100644
--- a/app/db/test_task_manage.py
+++ b/app/db/test_task_manage.py
@@ -2,7 +2,7 @@ from app import useDB
 from app.db import test_batch_manage
 class test_task_manage():
     def test_suite_list(self):
-        sql = 'select id,run_type from test_suite where status in (0,2) and run_type in ("2","Chrome");'
+        sql = 'select id,run_type from test_suite where status in (0,2) and isDeleted = 0 and run_type in ("2","Chrome");'
         idList = useDB.useDB().search(sql)
         return idList
 
diff --git a/app/static/scripts/core/test_suite.js b/app/static/scripts/core/test_suite.js
index 9c3cce2..d471567 100644
--- a/app/static/scripts/core/test_suite.js
+++ b/app/static/scripts/core/test_suite.js
@@ -89,8 +89,8 @@ var TableInit = function () {
                         var b = '<a href="javascript:;" onclick="window.location.href=(\'/attach_test_batch?test_suite_id='+ row.id + '\')">关联用例</a> ';
                         var e = '<a href="javascript:;" onclick="window.location.href=(\'/test_batch_detail?test_suite_id='+ row.id + '\')">执行详情</a> ';
                         var c = '<a href="javascript:;" onclick="runtest('+ row.id + ')">执行</a> ';
-//                        var d = '<a href="javascript:;" onclick="delete_test_suite(\'' + row.id + '\')">删除</a> ';
-                        return a +f+b+e+c ;
+                        var d = '<a href="javascript:;" onclick="delete_test_suite(\'' + row.id + '\')">删除</a> ';
+                        return a +f+b+e+c+d ;
                         }
                 }
                 ]