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

* Code for task#80490.

Browse Source
This commit is contained in:
xieqiyu
2022-12-19 16:05:17 +08:00
parent ed83ba0142
commit e5e8ecaa68
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/search/model.php
+3 -2
View File
@@ -978,6 +978,7 @@ class searchModel extends model
$programs = $this->app->user->view->programs;
$projects = $this->app->user->view->projects;
$executions = $this->app->user->view->sprints;
$ticketProducts = $this->loadModel('feedback')->getGrantProducts();
$objectPairs = array();
$total = count($results);
@@ -992,7 +993,7 @@ class searchModel extends model
$objectExecutions = array();
if(!isset($this->config->objectTables[$objectType])) continue;
$table = $this->config->objectTables[$objectType];
if(strpos(',bug,case,testcase,productplan,release,story,testtask,', ",$objectType,") !== false)
if(strpos(',bug,case,testcase,productplan,release,story,testtask,ticket,', ",$objectType,") !== false)
{
$objectProducts = $this->dao->select('id,product')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('product', 'id');
}
@@ -1103,7 +1104,7 @@ class searchModel extends model
foreach($objectProducts as $productID => $idList)
{
if(empty($productID)) continue;
if(strpos(",$products,", ",$productID,") === false)
if(strpos(",$products,", ",$productID,") === false or ($objectType == 'ticket' and !isset($ticketProducts[$productID])))
{
foreach($idList as $object)
{