From 146c1ca35f362048dce85e4ebd5d3b4cc703ca60 Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Thu, 29 Jun 2023 09:45:13 +0800
Subject: [PATCH] * testcase: replace the session_execution in configuration
 with real executionID in session.

---
 module/testcase/config/action.php  |  2 +-
 module/testcase/ui/browse.html.php | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/module/testcase/config/action.php b/module/testcase/config/action.php
index 01b24d4a50..20d1ef8e55 100644
--- a/module/testcase/config/action.php
+++ b/module/testcase/config/action.php
@@ -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;
diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php
index 81315d22aa..7b62e9ce9b 100644
--- a/module/testcase/ui/browse.html.php
+++ b/module/testcase/ui/browse.html.php
@@ -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)
 {