From 9ae184c762bc17a77e7dcbdca337c813ea92dcfe Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 23 Feb 2021 15:01:34 +0800 Subject: [PATCH] * Finish task#36038. --- module/common/model.php | 1 + module/index/js/index.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index e814eccf88..735f26bc1d 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2295,6 +2295,7 @@ EOD; public static function setMainMenuByGroup($group, $moduleName, $methodName) { global $lang; + global $config; if($group == 'my') { $lang->menu = $lang->my->menu; diff --git a/module/index/js/index.js b/module/index/js/index.js index 6bf44ae6ed..74c627256f 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -79,7 +79,10 @@ { return 'system'; } - + if(['caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa'].includes(moduleName)) + { + return link.prj ? 'project' : 'qa'; + } if(moduleName === 'report') { if(['usereport', 'editreport', 'deletereport', 'custom'].includes(methodLowerCase) && link.params.from)