From 151760b145fbe89846c7d2d8b375bd8f2a39a854 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 23 Feb 2021 14:10:11 +0800
Subject: [PATCH] * Code for task #36042.

---
 module/common/lang/menuOrder.php     |  2 +-
 module/common/lang/zh-cn.php         | 14 ++++++++++----
 module/user/view/featurebar.html.php | 15 +++++++++------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index de006bb55c..f6402611f6 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -8,7 +8,7 @@ $lang->mainNav->menuOrder[30] = 'doc';
 $lang->mainNav->menuOrder[35] = 'report';
 $lang->mainNav->menuOrder[60] = 'system';
 $lang->mainNav->menuOrder[70] = 'admin';
-if($config->global->mode == 'new') $lang->mainNav->menuOrder[10] = 'program';
+if($config->systemMode == 'new') $lang->mainNav->menuOrder[10] = 'program';
 
 /* Sort of main menu. */
 $lang->waterfall->menuOrder[5]  = 'programindex';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c68305e599..ca80803aa6 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -308,8 +308,11 @@ $lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testcase    = '用例|my|work|mode=testcase&type=assigntome';
 $lang->my->workMenu->testtask    = '测试单|my|work|mode=testtask&type=wait';
-$lang->my->workMenu->issue       = '问题|my|work|mode=issue';
-$lang->my->workMenu->risk        = '风险|my|work|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->workMenu->issue       = '问题|my|work|mode=issue';
+    $lang->my->workMenu->risk        = '风险|my|work|mode=risk';
+}
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = '任务|my|contribute|mode=task';
@@ -318,8 +321,11 @@ $lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=sto
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
 $lang->my->contributeMenu->testtask    = '测试单|my|contribute|mode=testtask&type=done';
-$lang->my->contributeMenu->issue       = '问题|my|contribute|mode=issue';
-$lang->my->contributeMenu->risk        = '风险|my|contribute|mode=risk';
+if($config->systemMode == 'new')
+{
+    $lang->my->contributeMenu->issue       = '问题|my|contribute|mode=issue';
+    $lang->my->contributeMenu->risk        = '风险|my|contribute|mode=risk';
+}
 
 $lang->my->dividerMenu = ',myProject,team,';
 
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 9d2a1d8e5b..e88cd83614 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -40,13 +40,16 @@
     $active = $methodName == 'execution' ? ' btn-active-text' : '';
     common::printLink('user', 'execution',  "userID={$user->id}", $label, '', "class='btn btn-link $active'");
 
-    $label  = "<span class='text'>{$lang->user->issue}</span>";
-    $active = ($methodName == 'issue' or $methodName == 'issue')? ' btn-active-text' : '';
-    common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    if($this->config->global->mode == 'new')
+    {
+        $label  = "<span class='text'>{$lang->user->issue}</span>";
+        $active = ($methodName == 'issue' or $methodName == 'issue')? ' btn-active-text' : '';
+        common::printLink('user', 'issue', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
 
-    $label  = "<span class='text'>{$lang->user->risk}</span>";
-    $active = ($methodName == 'risk' or $methodName == 'risk')? ' btn-active-text' : '';
-    common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+        $label  = "<span class='text'>{$lang->user->risk}</span>";
+        $active = ($methodName == 'risk' or $methodName == 'risk')? ' btn-active-text' : '';
+        common::printLink('user', 'risk', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    }
 
     $label  = "<span class='text'>{$lang->user->dynamic}</span>";
     $active = $methodName == 'dynamic' ? ' btn-active-text' : '';