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

Finish task#3277 调整测试报告,cost:4 left:0

Browse Source
This commit is contained in:
wangyidong
2017-10-25 10:10:31 +08:00
parent 5e3cc44e86
commit f560cb7091
9 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+2 -3
View File
@@ -134,14 +134,13 @@ class testtask extends control
$productID = $productID ? $productID : key($products);
$projects = $this->dao->select('id, name')->from(TABLE_PROJECT)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetchPairs('id');
$builds = $this->dao->select('id, name')->from(TABLE_BUILD)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->fetchPairs('id');
$builds = array('trunk' => $this->lang->trunk) + $builds;
}
/* Create testtask from testtask of test.*/
if($projectID == 0)
{
$projects = $this->product->getProjectPairs($productID, $branch = 0, $params = 'nodeleted');
$builds = $this->loadModel('build')->getProductBuildPairs($productID);
$builds = $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk');
}
/* Set menu. */
@@ -442,7 +441,7 @@ class testtask extends control
$this->view->task = $task;
$this->view->projects = $this->product->getProjectPairs($productID);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = '');
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = 'notrunk');
$this->view->users = $this->loadModel('user')->getPairs('nodeleted', $task->owner);
$this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');