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

Merge branch 'sprint/178_mayue_17638' into 'master'

Browse Source 
* Fix a bug #17638.

See merge request easycorp/zentaopms!1108
This commit is contained in:
孙广明
2021-12-23 06:56:01 +00:00
parent 6540fb4f0f be1671c243
commit 6e8f173eda
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -1466,7 +1466,7 @@ class bug extends control
$this->view->users = $users;
$this->view->assignedTo = $assignedTo;
$this->view->executions = $this->loadModel('product')->getExecutionPairsByProduct($productID, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID);
$this->view->builds = $this->loadModel('build')->getBuildPairs($productID, 'all', 'withbranch');
$this->view->builds = $this->loadModel('build')->getBuildPairs($productID, $bug->branch, 'withbranch');
$this->view->actions = $this->action->getList('bug', $bugID);
$this->display();
}
module/bug/model.php
+1 -2
View File
@@ -1386,7 +1386,7 @@ class bugModel extends model
{
$productIdList = array();
foreach($bugs as $bug) $productIdList[$bug->id] = $bug->product;
$builds = $this->loadModel('build')->getBuildPairs(array_unique($productIdList), 0, $params = '');
$builds = $this->loadModel('build')->getBuildPairs(array_unique($productIdList), 'all', $params = '');
/* Process the openedBuild and resolvedBuild fields. */
foreach($bugs as $key => $bug)
@@ -1401,7 +1401,6 @@ class bugModel extends model
$bug->openedBuild = rtrim($openedBuild, ',');
$bug->resolvedBuild = isset($builds[$bug->resolvedBuild]) ? $builds[$bug->resolvedBuild] : $bug->resolvedBuild;
}
return $bugs;
}