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

* Modify the code.

Browse Source
This commit is contained in:
tianshujie
2021-11-22 08:59:40 +08:00
parent 0408f2f8ce
commit 46ac0a5e88
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/bug/control.php
View File

@@ -435,7 +435,7 @@ class bug extends control
/* Get product, then set menu. */
$productID = $this->product->saveState($productID, $this->products);
$productInfo = $this->product->getById($productID);
$branches = $productInfo->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID, 'active');
if($branch === '') $branch = (int)$this->cookie->preBranch;
/* Init vars. */
@@ -506,7 +506,7 @@ class bug extends control
if($this->app->tab == 'execution' or $this->app->tab == 'project')
{
$objectID = $this->app->tab == 'project' ? $projectID : $executionID;
$productBranches = (isset($productInfo->type) and $productInfo->type != 'normal') ? $this->loadModel('execution')->getBranchByProduct($productID, $objectID) : array();
$productBranches = $productInfo->type != 'normal' ? $this->loadModel('execution')->getBranchByProduct($productID, $objectID) : array();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
$branch = key($branches);
}