diff --git a/module/bug/control.php b/module/bug/control.php index d3eebc1d67..d6b624dc13 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -128,6 +128,11 @@ class bug extends control /* Get bugs. */ $bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager); + if(empty($bugs) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $bugs = $this->bug->getBugs($productID, $projects, $branch, $browseType, $moduleID, $queryID, $sort, $pager); + } /* Process the sql, get the conditon partion, save it to session. */ $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', $browseType == 'needconfirm' ? false : true); diff --git a/module/caselib/control.php b/module/caselib/control.php index 134b4ff906..c9efe0324d 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -200,6 +200,12 @@ class caselib extends control /* save session .*/ $cases = $this->caselib->getLibCases($libID, $browseType, $queryID, $moduleID, $sort, $pager); + if(empty($cases) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $cases = $this->caselib->getLibCases($libID, $browseType, $queryID, $moduleID, $sort, $pager); + } + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', true); $this->loadModel('datatable'); diff --git a/module/product/control.php b/module/product/control.php index 41cfdee9d9..fdac7bd290 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -171,6 +171,11 @@ class product extends control /* Get stories. */ $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager); + if(empty($stories) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager); + } /* Process the sql, get the conditon partion, save it to session. */ $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', $browseType != 'bysearch'); diff --git a/module/project/control.php b/module/project/control.php index 6be581f157..4e8a7a21a3 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -182,8 +182,13 @@ class project extends control /* Get tasks. */ $tasks = $this->project->getTasks($productID, $projectID, $this->projects, $browseType, $queryID, $moduleID, $sort, $pager); + if(empty($tasks) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $tasks = $this->project->getTasks($productID, $projectID, $this->projects, $browseType, $queryID, $moduleID, $sort, $pager); + } - /* Build the search form. */ + /* Build the search form. */ $actionURL = $this->createLink('project', 'task', "projectID=$projectID&status=bySearch¶m=myQueryID"); $this->config->project->search['onMenuBar'] = 'yes'; $this->project->buildTaskSearchForm($projectID, $this->projects, $queryID, $actionURL); @@ -702,6 +707,12 @@ class project extends control $pager = new pager($recTotal, $recPerPage, $pageID); $stories = $this->story->getProjectStories($projectID, $sort, $type, $param, 'story', '', $pager); + if(empty($stories) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $stories = $this->story->getProjectStories($projectID, $sort, $type, $param, 'story', '', $pager); + } + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false); $users = $this->user->getPairs('noletter'); diff --git a/module/testcase/control.php b/module/testcase/control.php index f01a7a891f..8233e1f38f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -97,6 +97,11 @@ class testcase extends control /* Get test cases. */ $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager); + if(empty($cases) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager); + } /* save session .*/ $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', $browseType != 'bysearch' ? false : true); diff --git a/module/testreport/control.php b/module/testreport/control.php index 0f1962bbfa..90c7184105 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -64,6 +64,12 @@ class testreport extends control $pager = pager::init($recTotal, $recPerPage, $pageID); $reports = $this->testreport->getList($objectID, $objectType, $extra, $orderBy, $pager); + if(empty($reports) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $reports = $this->testreport->getList($objectID, $objectType, $extra, $orderBy, $pager); + } + if($objectType == 'project' and isset($_POST['taskIdList'])) { $taskIdList = $_POST['taskIdList']; diff --git a/module/testsuite/control.php b/module/testsuite/control.php index a937de27d1..d8e6027a23 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -49,6 +49,13 @@ class testsuite extends control $this->app->loadClass('pager', $static = true); $pager = pager::init($recTotal, $recPerPage, $pageID); + $suites = $this->testsuite->getSuites($productID, $sort, $pager); + if(empty($suites) and $pageID > 1) + { + $pager = pager::init(0, $recPerPage, 1); + $suites = $this->testsuite->getSuites($productID, $sort, $pager); + } + /* Append id for secend sort. */ $sort = $this->loadModel('common')->appendOrder($orderBy); $productName = isset($this->products[$productID]) ? $this->products[$productID] : ''; @@ -60,7 +67,7 @@ class testsuite extends control $this->view->productID = $productID; $this->view->productName = $productName; $this->view->orderBy = $orderBy; - $this->view->suites = $this->testsuite->getSuites($productID, $sort, $pager); + $this->view->suites = $suites; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->pager = $pager; diff --git a/module/testtask/control.php b/module/testtask/control.php index e6c570b6b0..6297cdd448 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -72,6 +72,14 @@ class testtask extends control $this->app->loadClass('pager', $static = true); $pager = pager::init($recTotal, $recPerPage, $pageID); + /* 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); + } + /* Append id for secend sort. */ $sort = $this->loadModel('common')->appendOrder($orderBy); @@ -81,7 +89,7 @@ class testtask extends control $this->view->productID = $productID; $this->view->productName = $this->products[$productID]; $this->view->orderBy = $orderBy; - $this->view->tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); + $this->view->tasks = $tasks; $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); $this->view->pager = $pager; $this->view->branch = $branch;