From de17879c593dd7702f63472e6791cc5659bbade6 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 1 Feb 2023 15:37:07 +0800
Subject: [PATCH]  * code for task #83436.

---
 module/admin/lang/menu.php           | 21 ++++++++++++++++++---
 module/common/lang/menu.php          | 13 -------------
 module/custom/view/required.html.php |  1 +
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 53bbc299ba..e4a13779bc 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -82,9 +82,6 @@ $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang-
 $lang->admin->menuList->model['menuOrder']['5']  = 'common';
 $lang->admin->menuList->model['menuOrder']['15'] = 'waterfall';
 
-if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum']);
-if($config->edition == 'max') $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
-
 $lang->admin->menuList->feature['subMenu']['my']          = array('link' => "{$lang->my->common}|custom|set|module=todo");
 $lang->admin->menuList->feature['subMenu']['product']     = array('link' => "{$lang->productCommon}|custom|product|");
 $lang->admin->menuList->feature['subMenu']['execution']   = array('link' => "{$lang->execution->common}|custom|execution|");
@@ -132,3 +129,21 @@ if($config->vision == 'lite')
     unset($lang->admin->menuList->system['menuOrder']['45']);
     unset($lang->admin->menuList->system['menuOrder']['50']);
 }
+
+if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum']);
+if(!helper::hasFeature('waterfall'))
+{
+    unset($lang->admin->menuList->model['subMenu']['waterfall']);
+    unset($lang->admin->menuList->model['menuOrder']['15']);
+}
+if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
+{
+    if(!helper::hasFeature('scrum_process'))
+    {
+        $lang->admin->menuList->model['menuOrder']['10'] = 'scrum';
+    }
+    else
+    {
+        unset($lang->admin->menuList->model['subMenu']['scrum']);
+    }
+}
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index c5b2aab74e..677538c228 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -712,7 +712,6 @@ if(!helper::hasFeature('product_track'))
     unset($lang->product->menu->track, $lang->product->menuOrder[40]);
     $lang->product->dividerMenu = str_replace(',track,', ',doc,', $lang->product->dividerMenu);
 }
-if(!helper::hasFeature('waterfall')) unset($lang->admin->menu->model['dropMenu']->waterfall);
 
 if(!helper::hasFeature('devops'))
 {
@@ -729,15 +728,3 @@ if(!helper::hasFeature('kanban'))
     unset($lang->mainNav->kanban, $lang->mainNav->menuOrder[40]);
     $lang->dividerMenu = str_replace(',kanban,' , ',doc,', $lang->dividerMenu);
 }
-
-if($config->edition == 'max' and !helper::hasFeature('scrum_auditplan'))
-{
-    if(!helper::hasFeature('scrum_process'))
-    {
-        $lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|process|scrumbrowse|processID=0&browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
-    }
-    else
-    {
-        unset($lang->admin->menu->model['dropMenu']->scrum);
-    }
-}
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index c98d668b19..85932e81f2 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -17,6 +17,7 @@ $('#navbar ul.nav li[data-id=<?php echo $moduleName?>]').addClass('active');
 <?php if($moduleName == 'bug'):?>
 $('#navbar ul.nav li[data-id=qa]').addClass('active');
 <?php endif;?>
+if($('#navbar ul.nav li[data-id=common]').length > 0) $('#navbar ul.nav li[data-id=common]').addClass('active');
 </script>
 <div id='mainContent' class='main-row'>
   <div class='side-col' id='sidebar'>