diff --git a/module/testcase/control.php b/module/testcase/control.php index 8577b9bd1f..5a57e58f93 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1558,8 +1558,7 @@ class testcase extends control /* Record the ID of the parent scene, so that the parent scene will be selected by default when creating a scene next time. */ helper::setcookie('lastCaseScene', $scene->parent); - $useSession = $this->app->tab != 'qa' && $this->session->caseList && strpos($this->session->caseList, 'dynamic') === false; - $locate = $useSession ? $this->session->caseList : inlink('browse', "productID={$scene->product}&branch={$scene->branch}&browseType=all¶m={$scene->module}"); + $locate = $this->session->caseList ?: inlink('browse', "productID={$scene->product}&branch={$scene->branch}&browseType=all¶m={$scene->module}"); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); } diff --git a/module/testcase/js/browse.ui.js b/module/testcase/js/browse.ui.js index 9ec06e9753..06b9933b3a 100644 --- a/module/testcase/js/browse.ui.js +++ b/module/testcase/js/browse.ui.js @@ -153,7 +153,7 @@ window.onRenderCell = function(result, {row, col}) { result.shift(); // 移除带链接的场景名称 result.push({html: data.title}); // 添加不带链接的场景名称 - if(data.grade == 1 && module) result.unshift({html: '' + module + ''}); // 顶级场景添加模块标签 + if(module) result.unshift({html: '' + module + ''}); // 添加模块标签 result.unshift({html: '' + scene + ''}); // 添加场景标签 if(data.hasCase == false) result.push({html: '(' + noCase + ')'}); // 添加暂无用例标签 } diff --git a/module/testcase/js/browsescene.ui.js b/module/testcase/js/browsescene.ui.js index c6b280f333..362529417e 100644 --- a/module/testcase/js/browsescene.ui.js +++ b/module/testcase/js/browsescene.ui.js @@ -105,7 +105,6 @@ window.onRenderCell = function(result, {row, col}) const data = row.data; const module = this.options.customData.modules[data.module]; if(module) result.unshift({ html: '' + module + '' }); // 顶级场景添加模块标签 - result.unshift({ html: '' + scene + '' }); // 添加场景标签 } if(row.data.lastEditedDate == '0000-00-00 00:00:00') row.data.lastEditedDate = ''; @@ -135,4 +134,4 @@ window.clickChangeOrder = function() $('#dragModal').on('click', '[data-dismiss=modal]', function() { loadCurrentPage({cache: false}); -}); \ No newline at end of file +}); diff --git a/module/testcase/ui/browsescene.html.php b/module/testcase/ui/browsescene.html.php index a382404b92..724d59ae1f 100644 --- a/module/testcase/ui/browsescene.html.php +++ b/module/testcase/ui/browsescene.html.php @@ -10,8 +10,6 @@ declare(strict_types=1); */ namespace zin; -jsVar('modules', $modulePairs); - include 'header.html.php'; $footToolbar = null; @@ -77,4 +75,4 @@ modal btn(setClass('primary mr-2'), $lang->testcase->dragModalChangeOrder, set('data-on', 'click'), set('data-call', 'clickChangeOrder')), btn($lang->close, set('data-dismiss', 'modal')) ) -); \ No newline at end of file +);