From e45c953c4a36a5f123c97049a8494566278be4bf Mon Sep 17 00:00:00 2001 From: zhaoke Date: Thu, 31 Aug 2023 11:07:22 +0800 Subject: [PATCH] * Fix the deleted test cases showed in testcase list. --- module/host/model.php | 2 ++ module/testtask/model.php | 1 + 2 files changed, 3 insertions(+) diff --git a/module/host/model.php b/module/host/model.php index d28d159ef4..94789b6508 100644 --- a/module/host/model.php +++ b/module/host/model.php @@ -157,6 +157,8 @@ class hostModel extends model ->setDefault('cpuNumber,cpuCores,diskSize,memory', 0) ->get(); + $hostInfo->admin = intval($hostInfo->admin); + $hostInfo->serverRoom = intval($hostInfo->serverRoom); $this->dao->update(TABLE_HOST)->data($hostInfo) ->batchCheck($this->config->host->create->requiredFields, 'notempty') ->batchCheck('diskSize,memory', 'float'); diff --git a/module/testtask/model.php b/module/testtask/model.php index f9887eb4b7..31de537a02 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -94,6 +94,7 @@ class testtaskModel extends model ->beginIF($endTime)->andWhere('t1.end')->le($endTime)->fi() ->beginIF($branch == BRANCH_MAIN) ->orWhere('(t1.build')->eq('trunk') + ->andWhere('t1.deleted')->eq(0) ->andWhere('t1.product')->eq((int)$productID) ->markRight(1) ->fi()