diff --git a/module/testtask/control.php b/module/testtask/control.php index 765478728a..a11b705b7c 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -117,21 +117,18 @@ class testtask extends control if($testtask->build == 'trunk' || empty($testtask->buildName)) $testtask->buildName = $this->lang->trunk; } - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; - $this->view->productID = $productID; - $this->view->product = $product; - $this->view->branch = $branch; - $this->view->tasks = $testtasks; - $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); - $this->view->pager = $pager; - $this->view->beginTime = $beginTime; - $this->view->endTime = $endTime; - $this->view->type = $type; - $this->view->orderBy = $orderBy; - $this->view->waitCount = $waitCount; - $this->view->testingCount = $testingCount; - $this->view->blockedCount = $blockedCount; - $this->view->doneCount = $doneCount; + $this->view->title = $product->name . $this->lang->colon . $this->lang->testtask->common; + $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); + $this->view->allSummary = sprintf($this->lang->testtask->allSummary, count($testtasks), $waitCount, $testingCount, $blockedCount, $doneCount); + $this->view->pageSummary = sprintf($this->lang->testtask->pageSummary, count($testtasks)); + $this->view->tasks = $testtasks; + $this->view->product = $product; + $this->view->branch = $branch; + $this->view->type = $type; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; + $this->view->beginTime = $beginTime; + $this->view->endTime = $endTime; $this->display(); } diff --git a/module/testtask/ui/browse.html.php b/module/testtask/ui/browse.html.php index c74d25baa5..2d649c61f7 100644 --- a/module/testtask/ui/browse.html.php +++ b/module/testtask/ui/browse.html.php @@ -13,7 +13,7 @@ $scopeAndStatus = explode(',', $type); $scope = !empty($scopeAndStatus[0]) ? $scopeAndStatus[0] : ''; $status = !empty($scopeAndStatus[1]) ? $scopeAndStatus[1] : ''; $viewName = $scope == 'local'? \zget($products, $productID) : $lang->testtask->all; -jsVar('condition', "productID=$productID&branch=$branch&type=$scope,$status&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}&pageID=1"); +jsVar('condition', "productID=$productID&branch=$branch&type=$type&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}&pageID=1"); $productDropdown = productMenu ( @@ -66,7 +66,7 @@ toolbar ) : null ); -$footerHTML = strtolower($status) == 'totalstatus' ? sprintf($lang->testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount, $doneCount) : sprintf($lang->testtask->pageSummary, count($tasks)); +$footerHTML = strtolower($status) == 'totalstatus' ? $allSummary : $pageSummary; dtable ( set::cols($cols),