From bc73b6d379ff6524db3f7e06fb42804ad6ddb274 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 9 Feb 2023 09:59:56 +0800
Subject: [PATCH] * Code for finish task #83727.

---
 module/admin/config.php | 15 +++++++++++----
 module/admin/model.php  |  7 +------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index a5ca0e2c4a..2cb602a112 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -20,14 +20,14 @@ $config->admin->menuGroup['convert']   = array('convert');
 
 $config->admin->menuModuleGroup['model']['custom|set']        = array('project', 'issue', 'risk', 'opportunity', 'nc');
 $config->admin->menuModuleGroup['model']['custom|required']   = array('project', 'build');
-$config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
-$config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'bug', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
+$config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user', 'ticket');
+$config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
 $config->admin->menuModuleGroup['template']['custom|set']     = array('baseline');
 if($config->vision == 'lite')
 {
-    $config->admin->menuModuleGroup['model']['custom|set']        = array('issue', 'risk', 'opportunity', 'nc');
+    $config->admin->menuModuleGroup['model']['custom|set']        = array();
     $config->admin->menuModuleGroup['model']['custom|required']   = array('build');
-    $config->admin->menuModuleGroup['feature']['custom|set']      = array('project', 'todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
+    $config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'block', 'task', 'story', 'user');
     $config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story', 'doc');
 }
 
@@ -78,3 +78,10 @@ $config->admin->helpURL['message']   = 'https://www.zentao.net/book/zentaopms/em
 $config->admin->helpURL['extension'] = 'https://www.zentao.net/book/zentaopms/536.html';
 $config->admin->helpURL['dev']       = 'https://www.zentao.net/book/zentaopms/537.html';
 $config->admin->helpURL['convert']   = 'https://www.zentao.net/book/zentaopms/656.html';
+
+$config->admin->navsGroup['my']        = ',todo,block,';
+$config->admin->navsGroup['product']   = ',product,story,productplan,release,';
+$config->admin->navsGroup['execution'] = ',execution,';
+$config->admin->navsGroup['project']   = ',project,story,';
+$config->admin->navsGroup['qa']        = ',bug,testcase,testsuite,testtask,testreport,caselib,';
+if($config->vision == 'lite') $config->admin->navsGroup['my'] .= 'task,';
diff --git a/module/admin/model.php b/module/admin/model.php
index 2c6f52f49a..0da4df405a 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -279,13 +279,8 @@ class adminModel extends model
                     $subModule = '';
                     if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
                     {
-                        if(strpos(',todo,block,', ",$paramName,") !== false and $subMenuKey == 'my') $subModule = 'custom';
-                        if(strpos(',product,story,productplan,release,', ",$paramName,") !== false and $subMenuKey == 'product') $subModule = 'custom';
-                        if(strpos(',task,', ",$paramName,") !== false and $subMenuKey == 'execution') $subModule = 'custom';
-                        if(strpos(',project,story,', ",$paramName,") !== false and $subMenuKey == 'project') $subModule = 'custom';
-                        if(strpos(',bug,testcase,testsuite,testtask,testreport,caselib,', ",$paramName,") !== false and $subMenuKey == 'qa') $subModule = 'custom';
+                        if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom';
                         if($paramName == $subMenuKey) $subModule = 'custom';
-                        if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
                     }
 
                     if(!empty($subModule)) $subMenu['subModule'] = $subModule;