diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 9886b231ff..80dc574cf2 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -76,7 +76,7 @@ $lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang $lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule'; $lang->admin->menuList->model['subMenu']['common'] = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom'); -$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|"); +$lang->admin->menuList->model['subMenu']['scrum'] = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl'); $lang->admin->menuList->model['subMenu']['waterfall'] = array('link' => "{$lang->waterfallModel}|stage|settype|", 'subModule' => 'stage'); $lang->admin->menuList->model['menuOrder']['5'] = 'common'; diff --git a/module/admin/model.php b/module/admin/model.php index 45acba68c4..8d02b38d01 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -273,20 +273,21 @@ class adminModel extends model { $moduleName = $this->app->rawModule; $methodName = $this->app->rawMethod; - $paramName = $this->app->rawParams ? reset($this->app->rawParams) : ''; + $firstParam = $this->app->rawParams ? reset($this->app->rawParams) : ''; + foreach($this->lang->admin->menuList->$menuKey['subMenu'] as $subMenuKey => $subMenu) { $subModule = ''; if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false) { - if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom'; - if($paramName == $subMenuKey) $subModule = 'custom'; + if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$firstParam,") !== false) $subModule = 'custom'; + if($firstParam == $subMenuKey) $subModule = 'custom'; } if(!empty($subModule)) $subMenu['subModule'] = $subModule; if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey])) { - if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule; + if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$firstParam]['subModule'] = $subModule; $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]; }