diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index d4f19279f7..d2aa872fa8 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -167,13 +167,13 @@ js::set('sysurl', common::getSysUrl()); productName):?> - doc->product;?> + doc->product;?> productName;?> projectName):?> - doc->project;?> + doc->project;?> projectName;?> diff --git a/module/project/model.php b/module/project/model.php index 61ae7e1279..76a14e6888 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -119,13 +119,19 @@ class projectModel extends model /* Replace for dropdown submenu. */ if(isset($this->lang->project->subMenu->$key)) { + $projectSubMenu = $this->lang->project->subMenu->$key; $subMenu = common::createSubMenu($this->lang->project->subMenu->$key, $projectID); if(!empty($subMenu)) { - foreach($subMenu as $menu) + foreach($subMenu as $menuKey => $menu) { - if($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method'])) + if($moduleName == strtolower($menu->link['module']) and + ( + $methodName == strtolower($menu->link['method']) or + (isset($projectSubMenu->$menuKey['alias']) and strpos($projectSubMenu->$menuKey['alias'], $methodName) !== false) + ) + ) { $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link); break;