From 5c4609d302387cd5425b5c6190901c97568382aa Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 31 Dec 2021 15:43:27 +0800 Subject: [PATCH] * Modify review problem. --- module/action/control.php | 2 +- module/api/control.php | 4 +-- module/bug/control.php | 2 +- module/caselib/control.php | 2 +- module/common/model.php | 2 +- module/company/control.php | 4 +-- module/doc/control.php | 2 +- module/execution/control.php | 10 +++--- module/my/control.php | 59 ++++++++++++++++++++-------------- module/my/js/common.js | 30 ++++++++--------- module/product/control.php | 4 +-- module/productplan/control.php | 4 +-- module/programplan/control.php | 2 +- module/project/control.php | 4 +-- module/story/control.php | 2 +- module/story/model.php | 2 +- module/task/control.php | 2 +- module/testcase/control.php | 2 +- module/testsuite/control.php | 4 +-- module/testtask/control.php | 6 ++-- module/user/control.php | 8 ++--- 21 files changed, 83 insertions(+), 74 deletions(-) diff --git a/module/action/control.php b/module/action/control.php index a70910daae..488ea7763a 100755 --- a/module/action/control.php +++ b/module/action/control.php @@ -60,7 +60,7 @@ class action extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $trashes = $this->action->getTrashes($type, $sort, $pager); /* Title and position. */ diff --git a/module/api/control.php b/module/api/control.php index 915d37e223..f7947e6b21 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -99,7 +99,7 @@ class api extends control $pager = new pager($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $releases = $this->api->getReleaseByQuery($libID, $pager, $sort); $this->view->releases = $releases; @@ -185,7 +185,7 @@ class api extends control $pager = new pager($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $structs = $this->api->getStructByQuery($libID, $pager, $sort); diff --git a/module/bug/control.php b/module/bug/control.php index 42a3d8e425..fb46535827 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -159,7 +159,7 @@ class bug extends control setcookie('qaBugOrder', $orderBy, 0, $this->config->webRoot, '', $this->config->cookieSecure, true); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Load pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/caselib/control.php b/module/caselib/control.php index 6fd78cb1fc..8aae891edf 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -203,7 +203,7 @@ class caselib extends control $this->caselib->buildSearchForm($libID, $libraries, $queryID, $actionURL); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* save session .*/ $cases = $this->caselib->getLibCases($libID, $browseType, $queryID, $moduleID, $sort, $pager); diff --git a/module/common/model.php b/module/common/model.php index 41dac7f075..904bd1c192 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2029,7 +2029,7 @@ EOD; * @access public * @return string */ - public function appendOrder($orderBy, $append = 'id') + public static function appendOrder($orderBy, $append = 'id') { if(empty($orderBy)) return $append; diff --git a/module/company/control.php b/module/company/control.php index 82c9e19d30..bf7abca473 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -63,7 +63,7 @@ class company extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Build the search form. */ $queryID = $type == 'bydept' ? 0 : (int)$param; @@ -205,7 +205,7 @@ class company extends control /* Append id for secend sort. */ $order = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($order); + $sort = common::appendOrder($order); $queryID = ($browseType == 'bysearch') ? (int)$param : 0; $date = empty($date) ? '' : date('Y-m-d', $date); diff --git a/module/doc/control.php b/module/doc/control.php index 4d9c57ef6e..62098690e4 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -92,7 +92,7 @@ class doc extends control $pager = new pager($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); if($browseType == 'collectedbyme') { diff --git a/module/execution/control.php b/module/execution/control.php index 43ae918936..27b9f1db40 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -198,7 +198,7 @@ class execution extends control setcookie('executionTaskOrder', $orderBy, 0, $this->config->webRoot, '', false, true); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Header and position. */ $this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->task; @@ -291,7 +291,7 @@ class execution extends control /* Get tasks and group them. */ if(empty($groupBy))$groupBy = 'story'; if(($groupBy == 'story') and ($execution->type == 'ops'))$groupBy = 'status'; - $sort = $this->loadModel('common')->appendOrder($groupBy); + $sort = common::appendOrder($groupBy); $tasks = $this->loadModel('task')->getExecutionTasks($executionID, $productID = 0, $status = 'all', $modules = 0, $sort); $groupBy = str_replace('`', '', $groupBy); $taskLang = $this->lang->task; @@ -753,7 +753,7 @@ class execution extends control setcookie('executionStoryOrder', $orderBy, 0, $this->config->webRoot, '', false, true); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $queryID = ($type == 'bysearch') ? $param : 0; $execution = $this->commonAction($executionID); @@ -922,7 +922,7 @@ class execution extends control $this->app->loadClass('pager', $static = true); if($this->app->getViewType() == 'xhtml') $recPerPage = 10; $pager = new pager($recTotal, $recPerPage, $pageID); - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $bugs = $this->bug->getExecutionBugs($executionID, $productID, $build, $type, $param, $sort, '', $pager); $bugs = $this->bug->checkDelayedBugs($bugs); $users = $this->user->getPairs('noletter'); @@ -2780,7 +2780,7 @@ class execution extends control /* Append id for secend sort. */ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Set the menu. If the executionID = 0, use the indexMenu instead. */ $this->execution->setMenu($executionID); diff --git a/module/my/control.php b/module/my/control.php index 8ea345bc97..e46c60c9af 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -103,22 +103,25 @@ class my extends control */ public function showWorkCount($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $this->loadModel('task'); + $this->loadModel('story'); + $this->loadModel('bug'); + $this->loadModel('testcase'); + $this->loadModel('testtask'); + /* Load pager. */ $this->app->loadClass('pager', $static = true); if($this->app->getViewType() == 'mhtml') $recPerPage = 10; $pager = pager::init($recTotal, $recPerPage, $pageID); - /* append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); - /* Get the number of tasks assigned to me. */ - $tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, 'assignedTo', 0, $pager, $sort); + $tasks = $this->task->getUserTasks($this->app->user->account, 'assignedTo', 0, $pager); $taskCount = $pager->recTotal; /* Get the number of stories assigned to me. */ - $assignedToStories = $this->loadModel('story')->getUserStories($this->app->user->account, 'assignedTo', $sort, $pager, 'story', false); + $assignedToStories = $this->story->getUserStories($this->app->user->account, 'assignedTo', $orderBy, $pager, 'story', false); $assignedToStoryCount = $pager->recTotal; - $reviewByStories = $this->loadModel('story')->getUserStories($this->app->user->account, 'reviewBy', $sort, $pager, 'story', false); + $reviewByStories = $this->story->getUserStories($this->app->user->account, 'reviewBy', $orderBy, $pager, 'story', false); $reviewByStoryCount = $pager->recTotal; $storyCount = $assignedToStoryCount + $reviewByStoryCount; @@ -127,23 +130,23 @@ class my extends control if($isOpenedURAndSR) { /* Get the number of requirements assigned to me. */ - $assignedRequirements = $this->loadModel('story')->getUserStories($this->app->user->account, 'assignedTo', $sort, $pager, 'requirement'); + $assignedRequirements = $this->story->getUserStories($this->app->user->account, 'assignedTo', $orderBy, $pager, 'requirement'); $assignedRequirementCount = $pager->recTotal; - $reviewByRequirements = $this->loadModel('story')->getUserStories($this->app->user->account, 'reviewBy', $sort, $pager, 'requirement'); + $reviewByRequirements = $this->story->getUserStories($this->app->user->account, 'reviewBy', $orderBy, $pager, 'requirement'); $reviewByRequirementCount = $pager->recTotal; $requirementCount = $assignedRequirementCount + $reviewByRequirementCount; } /* Get the number of bugs assigned to me. */ - $bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, 'assignedTo', $sort, 0, $pager); + $bugs = $this->bug->getUserBugs($this->app->user->account, 'assignedTo', $orderBy, 0, $pager); $bugCount = $pager->recTotal; /* Get the number of testcases assigned to me. */ - $cases = $this->loadModel('testcase')->getByAssignedTo($this->app->user->account, $sort, $pager, 'skip'); + $cases = $this->testcase->getByAssignedTo($this->app->user->account, $orderBy, $pager, 'skip'); $caseCount = $pager->recTotal; /* Get the number of testtasks assigned to me. */ - $testTasks = $this->loadModel('testtask')->getByUser($this->app->user->account, $pager, $sort, 'assignedTo'); + $testTasks = $this->testtask->getByUser($this->app->user->account, $pager, $orderBy, 'assignedTo'); $testTaskCount = $pager->recTotal; $issueCount = 0; @@ -154,16 +157,22 @@ class my extends control $isMaxVersion = isset($this->config->maxVersion) ? 1 : 0; if($isMaxVersion) { + + $this->loadModel('issue'); + $this->loadModel('risk'); + $this->loadModel('review'); + $this->loadModel('meeting'); + /* Get the number of issues assigned to me. */ - $issues = $this->loadModel('issue')->getUserIssues('assignedTo', $this->app->user->account, $orderBy, $pager); + $issues = $this->issue->getUserIssues('assignedTo', $this->app->user->account, $orderBy, $pager); $issueCount = $pager->recTotal; /* Get the number of risks assigned to me. */ - $risks = $this->loadModel('risk')->getUserRisks('assignedTo', $this->app->user->account, $orderBy, $pager); + $risks = $this->risk->getUserRisks('assignedTo', $this->app->user->account, $orderBy, $pager); $riskCount = $pager->recTotal; /* Get the number of reviews assigned to me. */ - $reviewList = $this->loadModel('review')->getUserReviews('wait', $orderBy, $pager); + $reviewList = $this->review->getUserReviews('wait', $orderBy, $pager); $reviewCount = $pager->recTotal; /* Get the number of nc assigned to me. */ @@ -171,7 +180,7 @@ class my extends control $ncCount = $pager->recTotal; /* Get the number of meetings assigned to me. */ - $meetings = $this->loadModel('meeting')->getListByUser('futureMeeting', $orderBy, 0, $pager); + $meetings = $this->meeting->getListByUser('futureMeeting', $orderBy, 0, $pager); $meetingCount = $pager->recTotal; } @@ -255,7 +264,7 @@ EOF; $this->view->position[] = $this->lang->my->todo; /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $todos = $this->loadModel('todo')->getList($type, $account, $status, 0, $pager, $sort); $tasks = $this->loadModel('task')->getUserSuspendedTasks($account); @@ -308,7 +317,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, 'story', false); if(!empty($stories)) $stories = $this->story->mergeReviewer($stories); @@ -352,7 +361,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, 'requirement'); if(!empty($stories)) $stories = $this->story->mergeReviewer($stories); @@ -396,7 +405,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Get tasks. */ $tasks = $this->loadModel('task')->getUserTasks($this->app->user->account, $type, 0, $pager, $sort); @@ -471,7 +480,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager); $bugs = $this->bug->checkDelayedBugs($bugs); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false); @@ -523,7 +532,7 @@ EOF; $this->app->loadLang('testcase'); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->testTask; $this->view->position[] = $this->lang->my->testTask; @@ -566,7 +575,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $cases = array(); if($type == 'assigntome') @@ -615,7 +624,7 @@ EOF; $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $docs = $this->doc->getDocsByBrowseType($type, 0, 0, $sort, $pager); @@ -901,7 +910,7 @@ EOF; $pager = new pager($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Get users by dept. */ $user = $this->loadModel('user')->getById($this->app->user->account, 'account'); @@ -1195,7 +1204,7 @@ EOF; /* Append id for secend sort. */ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* The header and position. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->dynamic; diff --git a/module/my/js/common.js b/module/my/js/common.js index d87d45d65a..cf9409645f 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -5,26 +5,26 @@ $(function() $('#subNavbar li[data-id=' + mode + ']').addClass('active'); if(typeof rawMethod === 'string' && rawMethod == 'work') { - $("#subNavbar li[data-id='task'] a").append('' + taskCount + ''); - $("#subNavbar li[data-id='story'] a").append('' + storyCount + ''); - $("#subNavbar li[data-id='bug'] a").append('' + bugCount + ''); - $("#subNavbar li[data-id='testcase'] a").append('' + caseCount + ''); - $("#subNavbar li[data-id='testtask'] a").append('' + testTaskCount + ''); + $("#subNavbar li[data-id='task'] a").append('' + taskCount + ''); + $("#subNavbar li[data-id='story'] a").append('' + storyCount + ''); + $("#subNavbar li[data-id='bug'] a").append('' + bugCount + ''); + $("#subNavbar li[data-id='testcase'] a").append('' + caseCount + ''); + $("#subNavbar li[data-id='testtask'] a").append('' + testTaskCount + ''); - if(isOpenedURAndSR !== 0) $("#subNavbar li[data-id='requirement'] a").append('' + requirementCount + ''); + if(isOpenedURAndSR !== 0) $("#subNavbar li[data-id='requirement'] a").append('' + requirementCount + ''); - if(isMaxVersion !== 0) - { - $("#subNavbar li[data-id='issue'] a").append('' + issueCount + ''); - $("#subNavbar li[data-id='risk'] a").append('' + riskCount + ''); - $("#subNavbar li[data-id='audit'] a").append('' + reviewCount + ''); - $("#subNavbar li[data-id='nc'] a").append('' + ncCount + ''); - $("#subNavbar li[data-id='myMeeting'] a").append('' + meetingCount + ''); - } + if(isMaxVersion !== 0) + { + $("#subNavbar li[data-id='issue'] a").append('' + issueCount + ''); + $("#subNavbar li[data-id='risk'] a").append('' + riskCount + ''); + $("#subNavbar li[data-id='audit'] a").append('' + reviewCount + ''); + $("#subNavbar li[data-id='nc'] a").append('' + ncCount + ''); + $("#subNavbar li[data-id='myMeeting'] a").append('' + meetingCount + ''); + } } } - var $scp = $('[data-id="changePassword"] a'); + var $scp = $('[data-id="changePassword"] a'); if($scp.length > 0) { var sign = config.requestType == 'GET' ? '&' : '?'; diff --git a/module/product/control.php b/module/product/control.php index 5c028d8df9..df73ec9ec3 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -214,7 +214,7 @@ class product extends control setcookie('productStoryOrder', $orderBy, 0, $this->config->webRoot, '', $this->config->cookieSecure, true); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Load pager. */ $this->app->loadClass('pager', $static = true); @@ -843,7 +843,7 @@ class product extends control /* Append id for secend sort. */ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Load pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/productplan/control.php b/module/productplan/control.php index a2b22d0268..647cf2e2c4 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -243,7 +243,7 @@ class productplan extends control $pager = new pager($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->session->set('productPlanList', $this->app->getURI(true), 'product'); $this->commonAction($productID, $branch); @@ -299,7 +299,7 @@ class productplan extends control if($this->app->getViewType() == 'xhtml') $recPerPage = 10; /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->commonAction($plan->product, $plan->branch); $products = $this->product->getProductPairsByProject($this->session->project); diff --git a/module/programplan/control.php b/module/programplan/control.php index 8faba1e7c3..35e18639cf 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -88,7 +88,7 @@ class programplan extends control if($type == 'lists') { - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->loadModel('datatable'); $plans = $this->programplan->getPlans($projectID, $this->productID, $sort); } diff --git a/module/project/control.php b/module/project/control.php index fc9993c614..61c93a747f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -822,7 +822,7 @@ class project extends control /* Append id for secend sort. */ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Set the pager. */ $this->app->loadClass('pager', $static = true); @@ -939,7 +939,7 @@ class project extends control /* Load pager and get bugs, user. */ $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $bugs = $this->bug->getProjectBugs($projectID, $productID, $build, $type, $param, $sort, '', $pager); $users = $this->user->getPairs('noletter'); diff --git a/module/story/control.php b/module/story/control.php index aa00d7b601..fc9bd961ea 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1764,7 +1764,7 @@ class story extends control } /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->view->title = $this->lang->story->zeroCase; $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $products[$productID]); diff --git a/module/story/model.php b/module/story/model.php index 3301d05324..c7341158b7 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4469,7 +4469,7 @@ class storyModel extends model public function sortStoriesOfPlan($planID, $sortIDList, $orderBy = 'id_desc', $pageID = 1, $recPerPage = 100) { /* Append id for secend sort. */ - $orderBy = $this->loadModel('common')->appendOrder($orderBy); + $orderBy = common::appendOrder($orderBy); /* Get all stories by plan. */ $stories = $this->getPlanStories($planID, 'all', $orderBy); diff --git a/module/task/control.php b/module/task/control.php index 5e4706d579..4c071db9b6 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1480,7 +1480,7 @@ class task extends control $taskLang = $this->lang->task; /* Create field lists. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $allExportFields); foreach($fields as $key => $fieldName) { diff --git a/module/testcase/control.php b/module/testcase/control.php index 2022e9fdde..b667771bec 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -148,7 +148,7 @@ class testcase extends control /* Load pager. */ $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Get test cases. */ $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager); diff --git a/module/testsuite/control.php b/module/testsuite/control.php index cfd2735440..3f9b6e4c6f 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -71,7 +71,7 @@ class testsuite extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $suites = $this->testsuite->getSuites($productID, $sort, $pager); if(empty($suites) and $pageID > 1) @@ -169,7 +169,7 @@ class testsuite extends control $this->session->set('caseList', $this->app->getURI(true), 'qa'); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Load pager. */ $this->app->loadClass('pager', $static = true); diff --git a/module/testtask/control.php b/module/testtask/control.php index 5b23cb42f0..157e503e02 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -117,7 +117,7 @@ class testtask extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Get tasks. */ $tasks = $this->testtask->getProductTasks($productID, $branch, $sort, $pager, $scopeAndStatus, $beginTime, $endTime); @@ -189,7 +189,7 @@ class testtask extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common; $this->view->position[] = html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), $this->products[$productID]); @@ -514,7 +514,7 @@ class testtask extends control } /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy, 't2.id'); + $sort = common::appendOrder($orderBy, 't2.id'); /* Get test cases. */ $runs = $this->testtask->getTaskCases($productID, $browseType, $queryID, $moduleID, $sort, $pager, $task); diff --git a/module/user/control.php b/module/user/control.php index a9f281c40f..42cec1bdc4 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -74,7 +74,7 @@ class user extends control $pager = pager::init($recTotal, $recPerPage, $pageID); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); /* Get user, totos. */ $account = $user->account; @@ -259,7 +259,7 @@ class user extends control $this->app->loadLang('testcase'); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->testTask; $this->view->position[] = $this->lang->user->testTask; @@ -301,7 +301,7 @@ class user extends control $users = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'id'); /* Append id for secend sort. */ - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $cases = array(); if($type == 'case2Him') @@ -1097,7 +1097,7 @@ class user extends control /* Append id for secend sort. */ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; - $sort = $this->loadModel('common')->appendOrder($orderBy); + $sort = common::appendOrder($orderBy); $date = empty($date) ? '' : date('Y-m-d', $date); $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', 'all', 'all', $date, $direction);