Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* testcase: replace the session_execution in configuration with real executionID in session.

Browse Source
This commit is contained in:
liugang
2023-06-29 09:45:13 +08:00
parent f21b3abe60
commit 146c1ca35f
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config/action.php
+1 -1
View File
@@ -55,7 +55,7 @@ $config->testcase->actionList['showScript']['url'] = array('module' => 'testcas
$config->testcase->actionList['editScene']['icon'] = 'edit';
$config->testcase->actionList['editScene']['text'] = $lang->testcase->editScene;
$config->testcase->actionList['editScene']['hint'] = $lang->testcase->editScene;
$config->testcase->actionList['editScene']['url'] = array('module' => 'testcase', 'method' => 'editScene', 'params' => 'sceneID={id}&executionID={session_execution}');
$config->testcase->actionList['editScene']['url'] = array('module' => 'testcase', 'method' => 'editScene', 'params' => 'sceneID={id}&executionID=%executionID%');
$config->testcase->actionList['deleteScene']['icon'] = 'trash';
$config->testcase->actionList['deleteScene']['text'] = $lang->testcase->deleteScene;
module/testcase/ui/browse.html.php
+11 -6
View File
@@ -109,14 +109,19 @@ if($canBatchChangeScene)
}
$cols = $this->loadModel('datatable')->getSetting('testcase');
if(!empty($cols['actions']['list']))
{
$executionID = ($app->tab == 'project' || $app->tab == 'execution') ? $this->session->{$app->tab} : '0';
foreach($cols['actions']['list'] as $method => $methodParams)
{
if(!isset($methodParams['url'])) continue;
$executionID = ($app->tab == 'project' || $app->tab == 'execution') ? $this->session->{$app->tab} : '0';
$url = $cols['actions']['list']['edit']['url'];
$url = str_replace('%executionID%', (string)$executionID, $url);
$cols['actions']['list'][$method]['url'] = str_replace('%executionID%', (string)$executionID, $methodParams['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;
if(isset($cols['title'])) $cols['title']['nestedToggle'] = $topSceneCount > 0;
if(isset($cols['story'])) $cols['story']['map'] = $stories;
foreach($scenes as $scene)
{