Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug#34403.

Browse Source
This commit is contained in:
朱金勇
2023-04-20 06:07:30 +00:00
parent b239aba280
commit 9bffb11ef0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
-1
View File
@@ -1114,7 +1114,6 @@ class testtask extends control
$this->config->testcase->search['params']['scene']['values'] = $this->testcase->getSceneMenu($productID, 0, $viewType = 'case', $startSceneID = 0, 0);
$this->config->testcase->search['style'] = 'simple';
$build = $this->loadModel('build')->getByID($task->build);
$stories = array();
if($build)
module/testtask/model.php
+2 -2
View File
@@ -389,7 +389,7 @@ class testtaskModel extends model
public function getAllLinkableCases($task, $query, $linkedCases, $pager)
{
return $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('id')->notIN($linkedCases)
->beginIF(!empty($linkedCases))->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('status')->ne('wait')
->andWhere('type')->ne('unit')
->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
@@ -423,7 +423,7 @@ class testtaskModel extends model
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
->andWhere('t1.product')->eq($productID)
->andWhere('t1.status')->ne('wait')
->beginIF($linkedCases)->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF(!empty($linkedCases))->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('t1.branch')->in("0,$task->branch")->fi()
->andWhere('t1.story')->in(trim($stories, ','))
->andWhere('t1.deleted')->eq(0)