diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php index 2303fc9f49..614ed04375 100644 --- a/module/block/view/recentprogramblock.html.php +++ b/module/block/view/recentprogramblock.html.php @@ -14,7 +14,7 @@ #cards .program-infos {font-size: 12px;} #cards .program-infos > span {display: inline-block; line-height: 12px;} #cards .program-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px} -#cards .program-infos > span + span {margin-left: 15px;} +#cards .program-infos > span + span {margin-left: 10px;} #cards .program-detail {position: absolute; bottom: 16px; left: 16px; right: 16px; font-size: 12px;} #cards .program-detail > p {margin-bottom: 8px;} #cards .program-detail .progress {height: 4px;} diff --git a/module/testtask/control.php b/module/testtask/control.php index 765cc1b4b5..32d4b9a0b4 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -77,18 +77,11 @@ class testtask extends control /* Get tasks. */ $tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); - if(empty($tasks) and $pageID > 1) - { - $pager = pager::init(0, $recPerPage, 1); - $tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); - } - /* Get tasks. */ - $tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); + $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; + $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); + $this->view->position[] = $this->lang->testtask->common; - $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; - $this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]); - $this->view->position[] = $this->lang->testtask->common; $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; $this->view->orderBy = $orderBy; diff --git a/module/testtask/model.php b/module/testtask/model.php index 29d0ca418f..afc9e4d2ca 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -203,7 +203,7 @@ class testtaskModel extends model ->where('t1.deleted')->eq(0) ->andWhere('t1.auto')->ne('unit') - ->andWhere('t1.project')->in("0,{$this->app->user->view->projects}") //Fix bug #3260. + ->andWhere('t1.project')->in("0,{$this->app->user->view->sprints}") //Fix bug #3260. ->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi() ->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi() ->beginIF($scopeAndStatus[1] == 'totalStatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi()