From 4ce033e9845b215efc16744b59545f67baa4938d Mon Sep 17 00:00:00 2001 From: wangxuepeng Date: Thu, 11 Jan 2024 09:52:04 +0800 Subject: [PATCH] * Fix bug #42616. --- module/testtask/control.php | 2 +- module/testtask/model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/testtask/control.php b/module/testtask/control.php index e3aa90d7a2..d32d7439ef 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -976,7 +976,7 @@ class testtask extends control $this->view->type = $type; $this->view->builds = $this->loadModel('build')->getBuildPairs(array($case->product), $case->branch); $this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter'); - $this->view->testtasks = $this->testtask->getPairs($case->product); + $this->view->testtasks = $this->testtask->getPairs($case->product, 0, 0, false); $this->display(); } diff --git a/module/testtask/model.php b/module/testtask/model.php index f10c8da506..b96d4b96ea 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -204,13 +204,13 @@ class testtaskModel extends model * @access public * @return array */ - public function getPairs(int $productID, int $executionID = 0, int $appendTaskID = 0): array + public function getPairs(int $productID, int $executionID = 0, int $appendTaskID = 0, bool $unit = true): array { $pairs = $this->dao->select('id, name')->from(TABLE_TESTTASK) ->where('deleted')->eq('0') ->andWhere('product')->eq($productID) ->beginIF($executionID)->andWhere('execution')->eq($executionID)->fi() - ->andWhere('auto')->ne('unit') + ->beginIF($unit)->andWhere('auto')->ne('unit')->fi() ->orderBy('id_desc') ->fetchPairs();