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

* Finish task #7957.

Browse Source
This commit is contained in:
tianshujie98
2020-09-16 09:28:02 +08:00
parent ac8bb689b7
commit 1d7a38ab4e
6 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+11 -1
View File
@@ -1264,7 +1264,7 @@ class bugModel extends model
$this->config->bug->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->bug->allProduct);
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
$this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0);
$this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairs($productID);
$this->config->bug->search['params']['project']['values'] = $this->product->getProjectPairs($productID) + array('all' => $this->lang->bug->allProject);
$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')->getProductBuildPairs($productID, 0, $params = '');
$this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
@@ -2323,6 +2323,16 @@ class bugModel extends model
$bugQuery = str_replace($allProduct, '1', $bugQuery);
$bugQuery = $bugQuery . ' AND `product` ' . helper::dbIN($products);
}
/* Fix bug #3356. */
$allProject = "`project` = 'all'";
if(strpos($bugQuery, $allProject) !== false)
{
$projects = $this->app->user->view->projects;
$bugQuery = str_replace($allProject, '1', $bugQuery);
$bugQuery = $bugQuery . ' AND `project` ' . helper::dbIN($projects);
}
$allBranch = "`branch` = 'all'";
if($branch and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);