From af79ca252bee39e72037498a73bfe0fdf62fa6f0 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Fri, 5 Mar 2021 09:47:30 +0800 Subject: [PATCH] * Distinguish project execution from case module. --- module/testcase/control.php | 16 ++++++++-------- module/testcase/model.php | 16 ++++++++-------- module/testcase/view/groupcase.html.php | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 2bde711679..12a6683d18 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -41,7 +41,7 @@ class testcase extends control $this->loadModel('user'); /* Set test case menu group. */ - $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0; + $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0; if(!$this->projectID) { $this->app->loadConfig('qa'); @@ -360,7 +360,7 @@ class testcase extends control $modules = $this->loadModel('tree')->getStoryModule($currentModuleID); $modules = $this->tree->getAllChildID($modules); } - $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false); + $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false); if($storyID and !isset($stories[$storyID])) $stories = $this->story->formatStories(array($storyID => $story)) + $stories;//Fix bug #2406. /* Set custom. */ @@ -1557,10 +1557,10 @@ class testcase extends control /** * Show import data * - * @param int $productID - * @param int $branch - * @param int $pagerID - * @param int $maxImport + * @param int $productID + * @param int $branch + * @param int $pagerID + * @param int $maxImport * @param string|int $insert 0 is covered old, 1 is insert new. * @access public * @return void @@ -1800,7 +1800,7 @@ class testcase extends control } /** - * Export case getModuleByStory + * Export case getModuleByStory * * @params int $storyID * @return void @@ -1808,7 +1808,7 @@ class testcase extends control public function ajaxGetStoryModule($storyID) { $story = $this->dao->select('module')->from(TABLE_STORY)->where('id')->eq($storyID)->fetch(); - $moduleID = !empty($story) ? $story->module : 0; + $moduleID = !empty($story) ? $story->module : 0; die(json_encode(array('moduleID'=> $moduleID))); } diff --git a/module/testcase/model.php b/module/testcase/model.php index f823ad925c..c37e4f41dc 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -73,7 +73,7 @@ class testcaseModel extends model ->add('fromBug', $bugID) ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', $now) - ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa', 'PRJ', $this->session->PRJ) + ->setIF($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa', 'project', $this->session->project) ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story)) ->remove('steps,expects,files,labels,stepType,forceNotReview') ->setDefault('story', 0) @@ -165,7 +165,7 @@ class testcaseModel extends model $data[$i] = new stdclass(); $data[$i]->product = $productID; - if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $data[$i]->PRJ = $this->session->PRJ; + if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $data[$i]->project = $this->session->project; $data[$i]->branch = $cases->branch[$i]; $data[$i]->module = $cases->module[$i]; $data[$i]->type = $cases->type[$i]; @@ -242,7 +242,7 @@ class testcaseModel extends model return $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1') ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id') ->where('t1.product')->eq((int)$productID) - ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi() + ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi() ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi() ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi() @@ -271,7 +271,7 @@ class testcaseModel extends model ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id') ->leftJoin(TABLE_SUITECASE)->alias('t3')->on('t1.id=t3.case') ->where('t1.product')->eq((int)$productID) - ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi() + ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi() ->andWhere('t3.suite')->eq((int)$suiteID) ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi() @@ -364,7 +364,7 @@ class testcaseModel extends model ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.version > t1.storyVersion') ->andWhere('t1.product')->eq($productID) - ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.PRJ')->eq($this->session->PRJ)->fi() + ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi() ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi() ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() @@ -455,7 +455,7 @@ class testcaseModel extends model */ public function getByAssignedTo($account, $orderBy = 'id_desc', $pager = null, $auto = 'no') { - return $this->dao->select('t1.*,t2.PRJ,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t1.*,t2.project,t2.pri,t2.title,t2.type,t2.openedBy,t2.color,t2.product,t2.branch,t2.module,t2.status')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_TESTTASK)->alias('t3')->on('t1.task = t3.id') ->where('t1.assignedTo')->eq($account) @@ -495,7 +495,7 @@ class testcaseModel extends model */ public function getStoryCases($storyID) { - return $this->dao->select('id, PRJ, title, pri, type, status, lastRunner, lastRunDate, lastRunResult') + return $this->dao->select('id, project, title, pri, type, status, lastRunner, lastRunDate, lastRunResult') ->from(TABLE_CASE) ->where('story')->eq((int)$storyID) ->andWhere('deleted')->eq(0) @@ -1124,7 +1124,7 @@ class testcaseModel extends model } else { - if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $caseData->PRJ = $this->session->PRJ; + if($this->config->systemMode == 'new' && $this->lang->navGroup->testcase != 'qa') $caseData->project = $this->session->project; $caseData->version = 1; $caseData->openedBy = $this->app->user->account; $caseData->openedDate = $now; diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index cbadcae9d4..100cd5d41c 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -30,8 +30,8 @@
- - + +
idAB;?>