diff --git a/module/build/control.php b/module/build/control.php index 62eacc7376..e9c94cea83 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -250,9 +250,9 @@ class build extends control $this->view->stories = $stories; $this->view->storyPager = $storyPager; - $newBugPager = new pager($type == 'newbug' ? $recTotal : 0, $recPerPage, $type == 'newbug' ? $pageID : 1); - $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'newbug' ? $orderBy : 'status_desc,id_desc', '', $newBugPager); - $this->view->newBugPager = $newBugPager; + $generatedBugPager = new pager($type == 'generatedBug' ? $recTotal : 0, $recPerPage, $type == 'generatedBug' ? $pageID : 1); + $this->view->generatedBugs = $this->bug->getProjectBugs($build->project, $build->id, '', 0, $type == 'generatedBug' ? $orderBy : 'status_desc,id_desc', '', $generatedBugPager); + $this->view->generatedBugPager = $generatedBugPager; } $this->executeHooks($buildID); diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index a4f9bbec2b..ce644bbb85 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -82,12 +82,12 @@ tbody tr td:first-child input{display:none;}
- +
' id='stories'> @@ -254,10 +254,10 @@ tbody tr td:first-child input{display:none;}
-
' id='newBugs'> +
' id='generatedBugs'>
- id}&type=newbug&link=$link¶m=$param&orderBy=%s";?> + id}&type=generatedBug&link=$link¶m=$param&orderBy=%s";?> @@ -308,12 +308,12 @@ tbody tr td:first-child input{display:none;}
idAB);?>
diff --git a/module/testreport/model.php b/module/testreport/model.php index 96def2bea3..2f8c4df39e 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -202,14 +202,14 @@ class testreportModel extends model */ public function getBugInfo($tasks, $productIdList, $begin, $end, $builds) { - $allNewBugs = $this->dao->select('*')->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('openedDate')->ge($begin)->andWhere('openedDate')->le("$end 23:59:59")->andWhere('deleted')->eq(0)->fetchAll(); - $foundBugs = array(); - $legacyBugs = array(); - $byCaseNum = 0; - $buildIdList = array_keys($builds); - $taskIdList = array_keys($tasks); + $generatedBugs = $this->dao->select('*')->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('openedDate')->ge($begin)->andWhere('openedDate')->le("$end 23:59:59")->andWhere('deleted')->eq(0)->fetchAll(); + $foundBugs = array(); + $legacyBugs = array(); + $byCaseNum = 0; + $buildIdList = array_keys($builds); + $taskIdList = array_keys($tasks); - foreach($allNewBugs as $bug) + foreach($generatedBugs as $bug) { if(!array_diff(explode(',', $bug->openedBuild), $buildIdList)) {