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

Merge branch 'sprint/170_tianshujie_16502' into 'sprint/170'

Browse Source 
* Fix bug #16502.

See merge request easycorp/zentaopms!562
This commit is contained in:
李玉春
2021-11-22 03:47:14 +00:00
parent 8b1d4b430d c5de287171
commit 53efb2c9b1
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+15 -1
View File
@@ -571,6 +571,20 @@ class testcase extends control
$showFields = str_replace(array(0 => ",branch,", 1 => ",platform,"), '', ",$showFields,");
$showFields = trim($showFields, ',');
}
if($this->app->tab == 'project' and $product->type != 'normal')
{
$this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
$productBranches = $this->loadModel('execution')->getBranchByProduct($productID, $this->session->project);
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}
else
{
$branches = $this->loadModel('branch')->getPairs($productID, 'active');
}
$this->view->customFields = $customFields;
$this->view->showFields = $showFields;
@@ -586,7 +600,7 @@ class testcase extends control
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->view->currentModuleID = $currentModuleID;
$this->view->branch = $branch;
$this->view->branches = $this->loadModel('branch')->getPairs($productID, 'active');
$this->view->branches = $branches;
$this->view->needReview = $this->testcase->forceNotReview() == true ? 0 : 1;
$this->display();