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

Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'

Browse Source 
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
This commit is contained in:
李玉春
2021-12-01 05:23:47 +00:00
parent 950c567912 c22503af7b
commit 686d773f0b
8 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+4 -5
View File
@@ -186,12 +186,10 @@ class testcase extends control
$moduleTree = $this->tree->getTreeMenu($productID, 'case', 0, array('treeModel', 'createCaseLink'), array('projectID' => $projectID, 'productID' => $productID), $projectID ? '' : $branch);
}
/* Display of branch label. */
$isShowBranch = $this->loadModel('branch')->isShowBranch($productID);
$product = $this->product->getById($productID);
if($product and $product->type != 'normal')
{
$this->app->loadLang('datatable');
$this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
}
/* Assign. */
$tree = $moduleID ? $this->tree->getByID($moduleID) : '';
@@ -220,6 +218,7 @@ class testcase extends control
$this->view->suiteID = $suiteID;
$this->view->setModule = true;
$this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
$this->view->isShowBranch = $isShowBranch;
$this->display();
}