From da14787a22bd43bc7a3bc8399778d734083d0d10 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 13 Jun 2023 16:49:07 +0800 Subject: [PATCH] * testcaseBrowse: use custom defined columns instead of configured ones. --- module/testcase/ui/browse.html.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index f171709e84..25fea8747d 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -352,15 +352,16 @@ if($canBatchChangeScene) ); } +$cols = $this->loadModel('datatable')->getSetting('testcase'); + $executionID = ($app->tab == 'project' || $app->tab == 'execution') ? $this->session->{$app->tab} : '0'; -$url = $config->testcase->dtable->fieldList['actions']['list']['edit']['url']; +$url = $cols['actions']['list']['edit']['url']; $url = str_replace('%executionID%', (string)$executionID, $url); -$config->testcase->dtable->fieldList['title']['nestedToggle'] = $topSceneCount > 0; -$config->testcase->dtable->fieldList['story']['map'] = $stories; -$config->testcase->dtable->fieldList['actions']['list']['edit']['url'] = $url; +if(isset($cols['actions'])) $cols['actions']['list']['edit']['url'] = $url; +if(isset($cols['title'])) $cols['title']['nestedToggle'] = $topSceneCount > 0; +if(isset($cols['story'])) $cols['story']['map'] = $stories; -$cols = $this->loadModel('datatable')->getSetting('testcase'); foreach($scenes as $scene) { $actionType = $scene->isCase == 1 ? 'testcase' : 'scene';