* Finish task#45004.

This commit is contained in:
xieqiyu
2021-11-30 19:43:49 +08:00
parent 63b0c9be3c
commit 4c0eb137da
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -551,7 +551,7 @@ class testtask extends control
$this->view->runs = $runs;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|qafirst|noletter');
$this->view->assignedToList = $assignedToList;
$this->view->moduleTree = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
$this->view->moduleTree = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID, $task->branch);
$this->view->browseType = $browseType;
$this->view->param = $param;
$this->view->orderBy = $orderBy;
+2
View File
@@ -16,3 +16,5 @@ td .warning {color: red;}
.fail .result-fail, .blocked .result-blocked {color: #f00;}
.pass .result-pass {color: green;}
.tree li > a.active {color: #0c64eb;}
+1 -1
View File
@@ -397,7 +397,7 @@ class treeModel extends model
{
$branchName = $this->branch->getById($branch);
$branches = array($branch => $branchName);
$extra = array('rootID' => $rootID, 'branch' => $branch);
$extra = $userFunc[1] == 'createTestTaskLink' ? $extra : array('rootID' => $rootID, 'branch' => $branch);
}
$manage = $userFunc[1] == 'createManageLink' ? true : false;