diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php index 860a4af7cf..44473f8cee 100644 --- a/module/testcase/config/table.php +++ b/module/testcase/config/table.php @@ -30,6 +30,12 @@ $config->testcase->dtable->fieldList['pri']['sortType'] = true; $config->testcase->dtable->fieldList['pri']['show'] = true; $config->testcase->dtable->fieldList['pri']['group'] = 2; +$config->testcase->dtable->fieldList['scene']['title'] = $lang->testcase->scene; +$config->testcase->dtable->fieldList['scene']['type'] = 'category'; +$config->testcase->dtable->fieldList['scene']['map'] = $lang->testcase->typeList; +$config->testcase->dtable->fieldList['scene']['group'] = 2; +$config->testcase->dtable->fieldList['scene']['sortType'] = true; + $config->testcase->dtable->fieldList['type']['title'] = $lang->testcase->type; $config->testcase->dtable->fieldList['type']['type'] = 'category'; $config->testcase->dtable->fieldList['type']['map'] = $lang->testcase->typeList; diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index 15fa681709..0ed11c5e5f 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -106,6 +106,7 @@ if(!empty($cols['actions']['list'])) if(isset($cols['title'])) $cols['title']['nestedToggle'] = $topSceneCount > 0; if(isset($cols['branch'])) $cols['branch']['map'] = $branchTagOption; if(isset($cols['story'])) $cols['story']['map'] = $stories; +if(isset($cols['scene'])) $cols['scene']['map'] = $iscenes; foreach($cases as $case) { diff --git a/module/testtask/ui/cases.html.php b/module/testtask/ui/cases.html.php index 1ab67fd033..03390ad211 100644 --- a/module/testtask/ui/cases.html.php +++ b/module/testtask/ui/cases.html.php @@ -149,6 +149,7 @@ $cols = $this->loadModel('datatable')->getSetting('testtask'); if(isset($cols['id']['name'])) $cols['id']['name'] = 'case'; if(isset($cols['title']['link']['params'])) $cols['title']['link']['params'] = 'caseID={case}'; if(isset($cols['bugs']['link']['params'])) $cols['bugs']['link']['params'] = 'caseID={case}'; +if(isset($cols['scene'])) $cols['scene']['map'] = $iscenes; $runs = initTableData($runs, $cols); diff --git a/module/testtask/zen.php b/module/testtask/zen.php index d4aa4e17fc..495a3c053c 100644 --- a/module/testtask/zen.php +++ b/module/testtask/zen.php @@ -336,6 +336,7 @@ class testtaskZen extends testtask $this->view->pager = $pager; $this->view->branch = $testtask->branch; $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($product->id, 'case', $showModule) : array(); + $this->view->iscenes = $this->testcase->getSceneMenu($product->id, $moduleID); } /**