From 0e5f623accb9e156f4e1681416e887ac2ddef221 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Fri, 11 Feb 2022 16:10:32 +0800 Subject: [PATCH] *Finish task #48844. --- module/bug/model.php | 2 +- module/bug/view/browse.html.php | 1 + module/testtask/control.php | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 55f1f1bd5d..2bc8a9e2d0 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1365,7 +1365,7 @@ class bugModel extends model if($browseType == 'bySearch') { $bug = $this->getById($bugID); - $bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', '', $pager); + $bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', '', $pager); foreach($bugs2Link as $key => $bug2Link) { if($bug2Link->id == $bugID) unset($bugs2Link[$key]); diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7f714340d2..416333c950 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -470,6 +470,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
+ show('right', 'pagerjs');?> diff --git a/module/testtask/control.php b/module/testtask/control.php index 76876c67e1..821cad48ee 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -240,11 +240,9 @@ class testtask extends control } /* Create testtask from testtask of test.*/ - $productID = $productID ? $productID : key($this->products); - $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID); - $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk'); - a($projectID); - a($productID); + $productID = $productID ? $productID : key($this->products); + $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID); + $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk'); $testreports = $this->testtask->getTestReportPairsByBuild($build); /* Set menu. */