From 47db91c402887bbce489d75da27b3f49cae505a3 Mon Sep 17 00:00:00 2001 From: liuhong Date: Mon, 8 Aug 2022 15:25:34 +0000 Subject: [PATCH 1/3] *Finish task #63772. --- module/bug/model.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module/bug/model.php b/module/bug/model.php index 80850637da..5a5470a304 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3191,9 +3191,19 @@ class bugModel extends model $class .= ' c-user'; $title = "title='" . zget($users, $bug->resolvedBy) . "'"; break; + case 'openedBy': + $class .= ' c-user'; + $title = "title='" . zget($users, $bug->openedBy) . "'"; + break; case 'project': $title = "title='" . zget($projectPairs, $bug->project, '') . "'"; break; + case 'plan': + $title = "title='" . zget($plans, $bug->plan, '') . "'"; + break; + case 'execution': + $title = "title='" . zget($executions, $bug->execution, '') . "'"; + break; case 'resolvedBuild': $class .= ' text-ellipsis'; $title = "title='" . $bug->resolvedBuild . "'"; From 8a159ba71478dbc68f434be9cfc7bccf1ce6cd04 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 9 Aug 2022 09:39:58 +0800 Subject: [PATCH 2/3] * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. --- module/execution/control.php | 2 +- module/project/control.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 733cadbe29..be171d60db 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1058,7 +1058,7 @@ class execution extends control $this->view->builds = $this->build->getBuildPairs($productID); $this->view->branchOption = $branchOption; $this->view->branchTagOption = $branchTagOption; - $this->view->plans = $this->loadModel('productplan')->getPairs($productID); + $this->view->plans = $this->loadModel('productplan')->getPairs($productID ? $productID : array_keys($products)); $this->view->stories = $storyList; $this->view->tasks = $taskList; $this->view->projectPairs = $this->loadModel('project')->getPairsByProgram(); diff --git a/module/project/control.php b/module/project/control.php index 8ffae21f8d..bc90f52216 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1183,7 +1183,7 @@ class project extends control $this->view->branchOption = $branchOption; $this->view->branchTagOption = $branchTagOption; $this->view->executions = $executions; - $this->view->plans = $this->loadModel('productplan')->getPairs($productID); + $this->view->plans = $this->loadModel('productplan')->getPairs($productID ? $productID : array_keys($products)); $this->view->stories = $storyList; $this->view->tasks = $taskList; $this->view->projectPairs = $this->project->getPairsByProgram(); From f323e7ad917cb63b464ddf0cd72bba47a381e60c Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 9 Aug 2022 10:46:05 +0800 Subject: [PATCH 3/3] * Code for task#63772. --- module/bug/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 5a5470a304..30993d7042 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3199,10 +3199,10 @@ class bugModel extends model $title = "title='" . zget($projectPairs, $bug->project, '') . "'"; break; case 'plan': - $title = "title='" . zget($plans, $bug->plan, '') . "'"; + $title = "title='" . zget($plans, $bug->plan) . "'"; break; case 'execution': - $title = "title='" . zget($executions, $bug->execution, '') . "'"; + $title = "title='" . zget($executions, $bug->execution) . "'"; break; case 'resolvedBuild': $class .= ' text-ellipsis';