From 6c479125965ac985cfbdf19845687d0a7de6613a Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 24 May 2021 08:56:11 +0800 Subject: [PATCH 1/4] * Fix bug #12755. --- module/block/view/testtaskblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 08e85a4c0c..96abd3848b 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -34,7 +34,7 @@ get->entry}'" : ''; $productViewLink = $this->createLink('product', 'browse', "productID={$testtask->product}"); - $buildViewLink = $this->createLink('build', 'view', "buildID={$testtask->execution}"); + $buildViewLink = $this->createLink('build', 'view', "buildID={$testtask->build}"); $testtaskViewLink = $this->createLink('testtask', 'view', "testtaskID={$testtask->id}"); ?> > From d55163f46490eafe2b1db434ad5ab9940d1ca96c Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 24 May 2021 08:56:32 +0800 Subject: [PATCH 2/4] * Add empty judgment. --- module/testreport/model.php | 10 ++++++++-- module/testreport/view/blockbugreport.html.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/module/testreport/model.php b/module/testreport/model.php index 78bdd7eb31..eb7a15f496 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -148,6 +148,7 @@ class testreportModel extends model $severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = $typeGroups = $stageGoups = $handleGroups = array(); /* Init stageGroups. */ + $isEmptyStage = true; foreach($this->lang->bug->priList as $priKey => $priValue) { $stageGroups[$priKey]['generated'] = 0; @@ -156,6 +157,7 @@ class testreportModel extends model } /* Init handleGroups. */ + $isEmptyHandle = true; $beginTimeStamp = strtotime($begin); $endTimeStamp = strtotime($end); for($i = $beginTimeStamp; $i <= $endTimeStamp; $i += 86400) @@ -174,6 +176,8 @@ class testreportModel extends model $resolvedDate = date('m-d', strtotime($bug->resolvedDate)); $stageGroups[$bug->pri]['resolved'] += 1; $handleGroups['resolved'][$resolvedDate] += 1; + $isEmptyStage = false; + $isEmptyHandle = false; } } @@ -187,6 +191,8 @@ class testreportModel extends model $foundBugs[$bug->id] = $bug; $stageGroups[$bug->pri]['generated'] += 1; $handleGroups['generated'][$openedDate] += 1; + $isEmptyStage = false; + $isEmptyHandle = false; if($bug->status == 'active' or $bug->resolvedDate > "$end 23:59:59") { @@ -228,8 +234,8 @@ class testreportModel extends model $bugInfo['countBugByTask'] = $byCaseNum; $bugInfo['bugConfirmedRate'] = empty($resolvedBugs) ? 0 : round((zget($resolutionGroups, 'fixed', 0) + zget($resolutionGroups, 'postponed', 0)) / $resolvedBugs * 100, 2); $bugInfo['bugCreateByCaseRate'] = empty($byCaseNum) ? 0 : round($byCaseNum / count($foundBugs) * 100, 2); - $bugInfo['bugStageGroups'] = $stageGroups; - $bugInfo['bugHandleGroups'] = $handleGroups; + $bugInfo['bugStageGroups'] = $isEmptyStage ? array() : $stageGroups; + $bugInfo['bugHandleGroups'] = $isEmptyHandle ? array() : $handleGroups; $this->app->loadLang('bug'); $users = $this->loadModel('user')->getPairs('noclosed|noletter|nodeleted'); diff --git a/module/testreport/view/blockbugreport.html.php b/module/testreport/view/blockbugreport.html.php index 5bc847ff9d..74dfa1fbbd 100644 --- a/module/testreport/view/blockbugreport.html.php +++ b/module/testreport/view/blockbugreport.html.php @@ -200,7 +200,7 @@ null);?> - +