From 0b49c198661b9e801903240c575e4e0b3795a039 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 11 Oct 2022 14:53:01 +0800 Subject: [PATCH] * Fix bug #28451. --- module/execution/control.php | 5 ++++- module/project/control.php | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/execution/control.php b/module/execution/control.php index 5d92d3ed7e..dc766565f8 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -516,7 +516,10 @@ class execution extends control $this->app->loadClass('pager', $static = true); $recTotal = count($tasks2Imported); $pager = new pager($recTotal, $recPerPage, $pageID); + $tasks2ImportedList = array_chunk($tasks2Imported, $pager->recPerPage, true); + $tasks2ImportedList = empty($tasks2ImportedList) ? $tasks2ImportedList : $tasks2ImportedList[$pageID - 1]; + $tasks2ImportedList = $this->loadModel('task')->processTasks($tasks2ImportedList); /* Save session. */ $this->app->session->set('taskList', $this->app->getURI(true), 'execution'); @@ -525,7 +528,7 @@ class execution extends control $this->view->pager = $pager; $this->view->position[] = html::a(inlink('browse', "executionID=$toExecution"), $execution->name); $this->view->position[] = $this->lang->execution->importTask; - $this->view->tasks2Imported = empty($tasks2ImportedList) ? $tasks2ImportedList : $tasks2ImportedList[$pageID - 1]; + $this->view->tasks2Imported = $tasks2ImportedList; $this->view->executions = $executions; $this->view->executionID = $execution->id; $this->view->fromExecution = $fromExecution; diff --git a/module/project/control.php b/module/project/control.php index 223f70fde3..4d21b444c4 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1176,6 +1176,7 @@ class project extends control /* Process the openedBuild and resolvedBuild fields. */ $bugs = $this->bug->getProjectBugs($projectID, $productID, $branchID, $build, $type, $param, $sort, '', $pager); $bugs = $this->bug->processBuildForBugs($bugs); + $bugs = $this->bug->checkDelayedBugs($bugs); /* Get story and task id list. */ $storyIdList = $taskIdList = array();