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

* Finish task #104000.

Browse Source
This commit is contained in:
hufangzhou
2023-10-10 14:00:26 +08:00
parent a47b8b6f90
commit 02080b8bcb
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+10 -3
View File
@@ -591,6 +591,9 @@ class execution extends control
$executions = $this->execution->getPairs(0, 'all', 'nocode');
$this->execution->setMenu($executionID);
$execution = $this->execution->getByID($executionID);
$project = $this->loadModel('project')->getByID($execution->project);
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
@@ -613,13 +616,18 @@ class execution extends control
->leftJoin(TABLE_EXECUTION)->alias('t2')
->on('t1.project = t2.id')
->where('t1.product')->in(array_keys($products))
->andWhere('t2.type')->in('sprint,stage,kanban')
->fetchPairs('project');
$projects = $this->loadModel('product')->getProjectPairsByProductIDList(array_keys($products));
}
else
{
$executionName = $executions[$executionID];
unset($executions);
$executions[$executionID] = $executionName;
$projects[$project->id] = $project->name;
}
/* Get bugs.*/
@@ -651,9 +659,6 @@ class execution extends control
$bugs = $this->execution->getSearchBugs($products, $executionID, $bugQuery, $pager, 'id_desc');
}
$execution = $this->execution->getByID($executionID);
$project = $this->loadModel('project')->getByID($execution->project);
/* Build the search form. */
$this->config->bug->search['actionURL'] = $this->createLink('execution', 'importBug', "executionID=$executionID&browseType=bySearch&param=myQueryID");
$this->config->bug->search['queryID'] = $queryID;
@@ -687,6 +692,8 @@ class execution extends control
}
$this->config->bug->search['params']['module']['values'] = $bugModules;
$this->config->bug->search['params']['project']['values'] = array('' => '') + $projects;
unset($this->config->bug->search['fields']['resolvedBy']);
unset($this->config->bug->search['fields']['closedBy']);
unset($this->config->bug->search['fields']['status']);