From dcdfb0cdee4c3e7dedda2f12fe1f7bf93f35212e Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 10:32:12 +0800 Subject: [PATCH 1/6] * Fix bug #19319. --- module/testtask/control.php | 4 ++-- module/testtask/model.php | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/module/testtask/control.php b/module/testtask/control.php index 5322cf2772..6dcde01ac9 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -1433,10 +1433,10 @@ class testtask extends control $user = $this->loadModel('user')->getById($userID, 'id'); $account = $user->account; - $testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status); + $testTasks = $this->testtask->getAjaxUserTestTaskPairs($account, 0, $status); if($id) return print(html::select("testtasks[$id]", $testTasks, '', 'class="form-control"')); - return print(html::select('testtask', $testTasks, '', 'class=form-control')); + return print(html::select('testtask', $testTasks, '', 'class="form-control"')); } /** diff --git a/module/testtask/model.php b/module/testtask/model.php index 83cd58c946..d492591197 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1074,6 +1074,38 @@ class testtaskModel extends model return $testtaskPairs; } + /** + * Get user test taskpairs for ajax. + * + * @param mixed $account + * @param int $limit + * @param string $status + * @param array $skipProductIDList + * @param array $skipExecutionIDList + * @access public + * @return void + */ + public function getAjaxUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array()) + { + $stmt = $this->dao->select('t1.id, t1.name, t2.name as execution') + ->from(TABLE_TESTTASK)->alias('t1') + ->leftjoin(TABLE_EXTENSION)->alias('t2')->on('t1.execution = t2.id') + ->where('t1.owner')->eq($account) + ->andWhere('t1.deleted')->eq(0) + ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi() + ->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi() + ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi() + ->beginIF($limit)->limit($limit)->fi() + ->query(); + + $testtaskPairs = array(); + while($testtask = $stmt->fetch()) + { + $testtaskPairs[$testtask->id] = $testtask->execution . ' ' . $testtask->name; + } + return $testtaskPairs; + } + /** * Get info of a test run. * From 106447b40160d08768366e712a36ca2c9f0e2497 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 10:56:50 +0800 Subject: [PATCH 2/6] * Fix bug #19319. --- module/testtask/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index d492591197..999c7efe88 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1101,7 +1101,7 @@ class testtaskModel extends model $testtaskPairs = array(); while($testtask = $stmt->fetch()) { - $testtaskPairs[$testtask->id] = $testtask->execution . ' ' . $testtask->name; + $testtaskPairs[$testtask->id] = $testtask->execution . $testtask->name; } return $testtaskPairs; } From bb828d54cf0914933d6a07a90181374d4b4b65bc Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 11:13:24 +0800 Subject: [PATCH 3/6] * Code for bug #19319. --- module/testtask/control.php | 2 +- module/testtask/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testtask/control.php b/module/testtask/control.php index 6dcde01ac9..a5026eb999 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -1433,7 +1433,7 @@ class testtask extends control $user = $this->loadModel('user')->getById($userID, 'id'); $account = $user->account; - $testTasks = $this->testtask->getAjaxUserTestTaskPairs($account, 0, $status); + $testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status); if($id) return print(html::select("testtasks[$id]", $testTasks, '', 'class="form-control"')); return print(html::select('testtask', $testTasks, '', 'class="form-control"')); diff --git a/module/testtask/model.php b/module/testtask/model.php index 999c7efe88..8ecac7d7ad 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1069,7 +1069,7 @@ class testtaskModel extends model $testtaskPairs = array(); while($testtask = $stmt->fetch()) { - $testtaskPairs[$testtask->id] = $testtask->execution . ' / ' . $testtask->name; + $testtaskPairs[$testtask->id] = $testtask->execution . "" . $testtask->name; } return $testtaskPairs; } From 127c3ff36ac95e520a5cc37f1b4e9145687b0a25 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 11:16:23 +0800 Subject: [PATCH 4/6] * Code for bug #19319. --- module/testtask/model.php | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 8ecac7d7ad..c75aebf622 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1074,38 +1074,6 @@ class testtaskModel extends model return $testtaskPairs; } - /** - * Get user test taskpairs for ajax. - * - * @param mixed $account - * @param int $limit - * @param string $status - * @param array $skipProductIDList - * @param array $skipExecutionIDList - * @access public - * @return void - */ - public function getAjaxUserTestTaskPairs($account, $limit = 0, $status = 'all', $skipProductIDList = array(), $skipExecutionIDList = array()) - { - $stmt = $this->dao->select('t1.id, t1.name, t2.name as execution') - ->from(TABLE_TESTTASK)->alias('t1') - ->leftjoin(TABLE_EXTENSION)->alias('t2')->on('t1.execution = t2.id') - ->where('t1.owner')->eq($account) - ->andWhere('t1.deleted')->eq(0) - ->beginIF($status != 'all')->andWhere('t1.status')->in($status)->fi() - ->beginIF(!empty($skipProductIDList))->andWhere('t1.product')->notin($skipProductIDList)->fi() - ->beginIF(!empty($skipExecutionIDList))->andWhere('t1.execution')->notin($skipExecutionIDList)->fi() - ->beginIF($limit)->limit($limit)->fi() - ->query(); - - $testtaskPairs = array(); - while($testtask = $stmt->fetch()) - { - $testtaskPairs[$testtask->id] = $testtask->execution . $testtask->name; - } - return $testtaskPairs; - } - /** * Get info of a test run. * From 1195ff854b7ea6e4241feb97196909bc03f35a94 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 11:20:41 +0800 Subject: [PATCH 5/6] * Fix bug #19319. --- module/testtask/model.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index c75aebf622..3d421adc53 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1069,7 +1069,14 @@ class testtaskModel extends model $testtaskPairs = array(); while($testtask = $stmt->fetch()) { - $testtaskPairs[$testtask->id] = $testtask->execution . "" . $testtask->name; + if($testtask->execution) + { + $testtaskPairs[$testtask->id] = $testtask->execution . " / " . $testtask->name; + } + else + { + $testtaskPairs[$testtask->id] = $testtask->name; + } } return $testtaskPairs; } From 3a545530a6ae647adf5031e45180a91c556dfbf1 Mon Sep 17 00:00:00 2001 From: zhangzilong Date: Mon, 14 Feb 2022 11:28:01 +0800 Subject: [PATCH 6/6] * Code for bug #19319. --- module/testtask/model.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 3d421adc53..b9826d3377 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1069,14 +1069,8 @@ class testtaskModel extends model $testtaskPairs = array(); while($testtask = $stmt->fetch()) { - if($testtask->execution) - { - $testtaskPairs[$testtask->id] = $testtask->execution . " / " . $testtask->name; - } - else - { - $testtaskPairs[$testtask->id] = $testtask->name; - } + if($testtask->execution) $testtask->execution .= " / "; + $testtaskPairs[$testtask->id] = $testtask->execution . $testtask->name; } return $testtaskPairs; }