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

Merge branch release/21.7.7 of zentao/zentaopms (#12188)

Browse Source
This commit is contained in:
刘刚
2025-11-05 14:35:00 +08:00
committed by Gitfox
parent 80ee8e285a 0713a62c05
commit 66549ac2c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -3
View File
@@ -754,7 +754,7 @@ class bugModel extends model
$productParams = $productParams + array('all' => $this->lang->all);
/* Get project params. */
$projectParams = $this->loadModel('product')->getProjectPairsByProduct($productID, 'all');
$projectParams = $this->loadModel('product')->getProjectPairsByProduct($productID, $branch);
$projectParams = $projectParams + array('all' => $this->lang->bug->allProject);
/* Get all modules. */
@@ -770,9 +770,9 @@ class bugModel extends model
$this->config->bug->search['queryID'] = $queryID;
$this->config->bug->search['params']['project']['values'] = $projectParams;
$this->config->bug->search['params']['product']['values'] = $productParams;
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID, '', '', true);
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
$this->config->bug->search['params']['module']['values'] = $modules;
$this->config->bug->search['params']['execution']['values'] = $this->loadModel('product')->getExecutionPairsByProduct($productID, '0', (int)$projectID);
$this->config->bug->search['params']['execution']['values'] = $this->loadModel('product')->getExecutionPairsByProduct($productID, $branch, (int)$projectID);
$this->config->bug->search['params']['severity']['values'] = array(0 => '') + $this->lang->bug->severityList; //Fix bug #939.
$this->config->bug->search['params']['openedBuild']['values'] = $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'withbranch|releasetag');
$this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];