diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7b5f85b40c..e2b545f0e1 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -148,7 +148,7 @@ $lang->product->menu->plan = array('link' => 'Plan|productplan|browse|product $lang->product->menu->release = array('link' => 'Release|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = 'Roadmap|product|roadmap|productID=%s'; $lang->product->menu->doc = array('link' => 'Doc|product|doc|productID=%s', 'subModule' => 'doc'); -$lang->product->menu->view = 'Info|product|view|productID=%s'; +$lang->product->menu->view = array('link' => 'Info|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = 'Modules|tree|browse|productID=%s&view=story'; $lang->product->menu->project = 'Projects|product|project|status=all&productID=%s'; $lang->product->menu->order = 'Order|product|order|productID=%s'; @@ -161,7 +161,7 @@ $lang->release->menu = $lang->product->menu; /* Project menu. */ $lang->project->menu->list = '%s'; $lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask'); -$lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'alias' => 'linkstory', 'subModule' => 'story'); +$lang->project->menu->story = array('link' => 'Story|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory'); $lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; $lang->project->menu->dynamic = 'Dynamic|project|dynamic|projectID=%s'; $lang->project->menu->build = array('link' => 'Build|project|build|projectID=%s', 'subModule' => 'build'); @@ -169,7 +169,7 @@ $lang->project->menu->testtask = 'Testtask|project|testtask|projectID=%s'; $lang->project->menu->burn = 'Burn|project|burn|projectID=%s'; $lang->project->menu->team = array('link' => 'Team|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => 'Doc|project|doc|porjectID=%s', 'subModule' => 'doc'); -$lang->project->menu->product = 'Product|project|manageproducts|projectID=%s'; +$lang->project->menu->product = array('link' => 'Product|project|manageproducts|projectID=%s', 'alias' => 'edit'); $lang->project->menu->view = 'Info|project|view|projectID=%s'; $lang->project->menu->order = 'Order|project|order|projectID=%s'; $lang->project->menu->create = array('link' => ' New|project|create', 'float' => 'right'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 86154c75ab..941250f4e4 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -148,7 +148,7 @@ $lang->product->menu->plan = array('link' => '计划|productplan|browse|produ $lang->product->menu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->menu->roadmap = '路线图|product|roadmap|productID=%s'; $lang->product->menu->doc = array('link' => '文档|product|doc|productID=%s', 'subModule' => 'doc'); -$lang->product->menu->view = '概况|product|view|productID=%s'; +$lang->product->menu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); $lang->product->menu->module = '模块|tree|browse|productID=%s&view=story'; $lang->product->menu->project = '项目列表|product|project|status=all&productID=%s'; $lang->product->menu->order = '排序|product|order|productID=%s'; @@ -161,7 +161,7 @@ $lang->release->menu = $lang->product->menu; /* 项目视图菜单设置。*/ $lang->project->menu->list = '%s'; $lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask,burn'); -$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'alias' => 'linkstory', 'subModule' => 'story'); +$lang->project->menu->story = array('link' => '需求|project|story|projectID=%s', 'subModule' => 'story', 'alias' => 'linkstory'); $lang->project->menu->bug = 'Bug|project|bug|projectID=%s'; $lang->project->menu->dynamic = '动态|project|dynamic|projectID=%s'; $lang->project->menu->build = array('link' => '版本|project|build|projectID=%s', 'subModule' => 'build'); @@ -169,7 +169,7 @@ $lang->project->menu->testtask = '测试申请|project|testtask|projectID=%s'; $lang->project->menu->team = array('link' => '团队|project|team|projectID=%s', 'alias' => 'managemembers'); $lang->project->menu->doc = array('link' => '文档|project|doc|porjectID=%s', 'subModule' => 'doc'); $lang->project->menu->product = '产品|project|manageproducts|projectID=%s'; -$lang->project->menu->view = '概况|project|view|projectID=%s'; +$lang->project->menu->view = array('link' => '概况|project|view|projectID=%s', 'alias' => 'edit'); $lang->project->menu->order = '排序|project|order|projectID=%s'; $lang->project->menu->create = array('link' => ' 新增项目|project|create', 'float' => 'right'); $lang->project->menu->copy = array('link' => ' 复制项目|project|create|projectID=©ProjectID=%s', 'float' => 'right'); diff --git a/module/common/model.php b/module/common/model.php index e4218e2754..4ae21a7168 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -374,7 +374,7 @@ class commonModel extends model { /* Is the currentModule active? */ if($currentModule == $subModule and $float != 'right') $active = 'active'; - if($module == $currentModule and ($method == $currentMethod or strpos($alias, $currentMethod) !== false) and $float != 'right') $active = 'active'; + if($module == $currentModule and ($method == $currentMethod or in_array($currentMethod, explode(',', $alias))) and $float != 'right') $active = 'active'; echo "