From 425124cf69736ecdb576a57dd1db9a4ce82812b9 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 3 Jan 2024 11:13:20 +0800 Subject: [PATCH] * Fix bug #42916. --- module/execution/ui/testcase.html.php | 1 + module/execution/zen.php | 1 + module/testcase/config/table.php | 3 +++ 3 files changed, 5 insertions(+) diff --git a/module/execution/ui/testcase.html.php b/module/execution/ui/testcase.html.php index 343b4bb056..c2ff92c5d8 100644 --- a/module/execution/ui/testcase.html.php +++ b/module/execution/ui/testcase.html.php @@ -38,6 +38,7 @@ sidebar if(isset($config->testcase->dtable->fieldList['branch'])) $config->testcase->dtable->fieldList['branch']['map'] = $branchTagOption; if(isset($config->testcase->dtable->fieldList['story'])) $config->testcase->dtable->fieldList['story']['map'] = $stories; +if(isset($config->testcase->dtable->fieldList['scene'])) $config->testcase->dtable->fieldList['scene']['map'] = $scenes; $config->testcase->dtable->fieldList['actions']['list']['edit']['url'] = str_replace('%executionID%', (string)$executionID, $config->testcase->dtable->fieldList['actions']['list']['edit']['url']); $config->testcase->dtable->fieldList['actions']['menu'] = array(array('confirmStoryChange'), array('runCase', 'runResult', 'edit', 'createBug', 'create')); $this->config->testcase->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => "caseID={id}"); diff --git a/module/execution/zen.php b/module/execution/zen.php index 08dbfcfd15..4738d8efb7 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -401,6 +401,7 @@ class executionZen extends execution $tree = $moduleID ? $this->tree->getByID($moduleID) : ''; $this->view->cases = $cases; + $this->view->scenes = $this->testcase->getSceneMenu($productID, $moduleID);; $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->title = $this->lang->execution->testcase; $this->view->executionID = $executionID; diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php index 2139913fc8..2cc13884f5 100644 --- a/module/testcase/config/table.php +++ b/module/testcase/config/table.php @@ -132,11 +132,13 @@ $config->testcase->dtable->fieldList['stepNumber']['sortType'] = false; $config->testcase->dtable->fieldList['version']['title'] = $lang->testcase->version; $config->testcase->dtable->fieldList['version']['type'] = 'text'; $config->testcase->dtable->fieldList['version']['group'] = 5; +$config->testcase->dtable->fieldList['version']['width'] = '80'; $config->testcase->dtable->fieldList['version']['sortType'] = false; $config->testcase->dtable->fieldList['lastEditedBy']['title'] = $lang->testcase->lastEditedBy; $config->testcase->dtable->fieldList['lastEditedBy']['type'] = 'user'; $config->testcase->dtable->fieldList['lastEditedBy']['group'] = 6; +$config->testcase->dtable->fieldList['lastEditedBy']['width'] = '90'; $config->testcase->dtable->fieldList['lastEditedBy']['sortType'] = true; $config->testcase->dtable->fieldList['lastEditedDate']['title'] = $lang->testcase->lastEditedDate; @@ -148,6 +150,7 @@ $config->testcase->dtable->fieldList['product']['title'] = 'product'; $config->testcase->dtable->fieldList['product']['control'] = 'hidden'; $config->testcase->dtable->fieldList['product']['dataSource'] = array('module' => 'product', 'method' => 'getPairs', 'params' => ['mode' => '', 'programID' => 0, 'append' => '', 'shadow' => 'all']); $config->testcase->dtable->fieldList['product']['display'] = false; +$config->testcase->dtable->fieldList['product']['hidden'] = true; $config->testcase->dtable->fieldList['module']['control'] = 'select'; $config->testcase->dtable->fieldList['module']['dataSource'] = array('module' => 'testcase', 'method' => 'getDatatableModules', 'params' => ['productID' => (int)'$productID']);