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

* Fix bug #44855.

Browse Source
This commit is contained in:
tianshujie
2024-01-23 15:56:52 +08:00
parent 578f805ed5
commit 52fe5cf555
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -374,7 +374,7 @@ class execution extends control
/* Get users, products, executions, project and projects.*/
$users = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
$products = $this->loadModel('product')->getProductPairsByProject($executionID);
$executions = !empty($products) ? $this->execution->getPairsByProduct(array_keys($products)) : $executions[$executionID] = $execution->name;
$executions = !empty($products) ? $this->execution->getPairsByProduct(array_keys($products)) : array($executionID => $execution->name);
$project = $this->loadModel('project')->getByID($execution->project);
!empty($products) ? $projects = $this->product->getProjectPairsByProductIDList(array_keys($products)) : $projects[$project->id] = $project->name;
module/execution/zen.php
+3 -5
View File
@@ -791,11 +791,9 @@ class executionZen extends execution
$bugModules[$moduleID] = $productName . $moduleName;
}
}
$this->config->bug->search['params']['module']['values'] = $bugModules;
$this->config->bug->search['params']['project']['values'] = array('' => '') + $projects;
$this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs($productID, 'all', 'withbranch|releasetag');
$this->config->bug->search['params']['module']['values'] = $bugModules;
$this->config->bug->search['params']['project']['values'] = $projects;
$this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs(array_keys($products), 'all', 'withbranch|releasetag');
unset($this->config->bug->search['fields']['resolvedBy']);
unset($this->config->bug->search['fields']['closedBy']);