From 52fe5cf5550e5d3e35b3a3b6af9fafdc02e24aad Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 23 Jan 2024 15:56:52 +0800 Subject: [PATCH] * Fix bug #44855. --- module/execution/control.php | 2 +- module/execution/zen.php | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 3ceab65f8e..87e922a5b9 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -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; diff --git a/module/execution/zen.php b/module/execution/zen.php index 22578557a2..c552f44db6 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -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']);