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

* finish task #2896.

Browse Source
This commit is contained in:
wangyidong
2017-03-03 09:00:45 +08:00
parent 20078c8695
commit 22115ecfbd
23 changed files with 323 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/testtask/control.php
View File

@@ -261,6 +261,11 @@ class testtask extends control
$this->config->testcase->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct);
$this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
$this->config->testcase->search['actionURL'] = inlink('cases', "taskID=$taskID&browseType=bySearch&queryID=myQueryID");
if(!$this->config->testcase->needReview)
{
unset($this->lang->testcase->statusList['wait']);
$this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
}
unset($this->config->testcase->search['fields']['branch']);
unset($this->config->testcase->search['params']['branch']);
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
@@ -564,6 +569,11 @@ class testtask extends control
if($task->branch) $branches = array('' => '', $task->branch => $branches[$task->branch]);
$this->config->testcase->search['params']['branch']['values'] = $branches;
}
if(!$this->config->testcase->needReview)
{
unset($this->lang->testcase->statusList['wait']);
$this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
}
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
$this->view->title = $task->name . $this->lang->colon . $this->lang->testtask->linkCase;
@@ -642,6 +652,8 @@ class testtask extends control
$this->view->taskID = $taskID;
$this->view->pager = $pager;
$this->view->task = $task;
$this->view->type = $type;
$this->view->param = $param;
$this->view->suiteList = $this->loadModel('testsuite')->getSuites($task->product);
$this->display();