diff --git a/module/common/lang/en.php b/module/common/lang/en.php index a65f5cd438..2f34eadcaa 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -179,7 +179,7 @@ $lang->project = new stdclass(); $lang->project->menu = new stdclass(); $lang->project->menu->list = '%s'; -$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask,importbug,burn'); +$lang->project->menu->task = array('link' => 'Task|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,importbug,burn'); $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'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 547c113418..577a360889 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -179,7 +179,7 @@ $lang->project = new stdclass(); $lang->project->menu = new stdclass(); $lang->project->menu->list = '%s'; -$lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task', 'alias' => 'grouptask,importtask,burn,importbug'); +$lang->project->menu->task = array('link' => '任务|project|task|projectID=%s', 'subModule' => 'task,tree', 'alias' => 'grouptask,importtask,burn,importbug'); $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'; diff --git a/module/common/model.php b/module/common/model.php index e59974e92b..7852085e3f 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -386,7 +386,8 @@ class commonModel extends model if(common::hasPriv($module, $method)) { /* Is the currentModule active? */ - if($currentModule == $subModule and $float != 'right') $active = 'active'; + $subModules = explode(',', $subModule); + if(in_array($currentModule,$subModules) and $float != 'right') $active = 'active'; if($module == $currentModule and ($method == $currentMethod or strpos(",$alias,", ",$currentMethod,") !== false) and $float != 'right') $active = 'active'; echo "