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

* Finish task #7554.

Browse Source
This commit is contained in:
holan20180123
2020-07-27 15:20:45 +08:00
parent b15539ed6a
commit 71209416b2
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+2 -7
View File
@@ -861,13 +861,8 @@ class testtask extends control
$this->loadModel('testcase');
$this->config->testcase->search['params']['product']['values']= array($productID => $this->products[$productID]);
$this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
$this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=myQueryID");
$this->config->testcase->search['queryID'] = $param;
if($param)
{
$query = $this->loadModel('search')->getQuery($param);
if($query) $this->session->set('testcaseForm', $query->form);
}
$this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=$param");
$this->config->testcase->search['style'] = 'simple';
if($this->session->currentProductType == 'normal')
{
unset($this->config->testcase->search['fields']['branch']);
module/testtask/model.php
+3 -3
View File
@@ -495,7 +495,7 @@ class testtaskModel extends model
if($type == 'bystory') $cases = $this->getLinkableCasesByStory($productID, $task, $query, $linkedCases, $pager);
if($type == 'bybug') $cases = $this->getLinkableCasesByBug($productID, $task, $query, $linkedCases, $pager);
if($type == 'bysuite') $cases = $this->getLinkableCasesBySuite($productID, $task, $query, $param, $linkedCases, $pager);
if($type == 'bybuild') $cases = $this->getLinkableCasesByTestTask($param, $linkedCases, $pager);
if($type == 'bybuild') $cases = $this->getLinkableCasesByTestTask($param, $linkedCases, $query, $pager);
return $cases;
}
@@ -624,11 +624,11 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getLinkableCasesByTestTask($testTask, $linkedCases, $pager)
public function getLinkableCasesByTestTask($testTask, $linkedCases, $query, $pager)
{
$caseList = $this->dao->select("`case`")->from(TABLE_TESTRUN)->where('task')->eq($testTask)->andWhere('`case`')->notin($linkedCases)->fetchPairs('case');
return $this->dao->select("*")->from(TABLE_CASE)->where('id')->in($caseList)->andWhere('status')->ne('wait')->page($pager)->fetchAll();
return $this->dao->select("*")->from(TABLE_CASE)->where($query)->andWhere('id')->in($caseList)->andWhere('status')->ne('wait')->page($pager)->fetchAll();
}
/**