diff --git a/config/filter.php b/config/filter.php index 244e589df6..71cb71ac32 100644 --- a/config/filter.php +++ b/config/filter.php @@ -26,6 +26,7 @@ $filter->default->cookie['lang'] = 'reg::lang'; $filter->default->cookie['theme'] = 'reg::word'; $filter->default->cookie['fingerprint'] = 'reg::word'; $filter->default->cookie['hideMenu'] = 'equal::true'; +$filter->default->cookie['systemModel'] = 'code'; $filter->bug = new stdclass(); $filter->caselib = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 2056de9939..ba48f6e9f3 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -144,27 +144,20 @@ $lang->program = new stdclass(); /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->subMenu = new stdclass(); -$lang->system->subMenu->setmodel = new stdclass(); -$lang->system->menu->setmodel = array('link' => 'cmmi|custom|setcmmi|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->estimate = array('link' => '估算|custom|estimate|'); $lang->system->menu->stage = array('link' => '阶段|stage|browse|', 'subModule' => 'stage'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|plan|'); -$lang->system->subMenu->setmodel->scrum ='scrum|custom|setscrum|'; $lang->system->dividerMenu = ',auditcl,subject,'; -if($_COOKIE['systemModel'] == 'scrum') +if(isset($_COOKIE['systemModel']) and $_COOKIE['systemModel'] == 'scrum') { $lang->system->menu = new stdclass(); - $lang->system->subMenu->setmodel = new stdclass(); - $lang->system->menu->setmodel = array('link' => 'scrum|custom|setscrum|', 'class' => 'dropdown dropdown-hover'); $lang->system->menu->subject = array('link' => '科目|subject|browse|'); $lang->system->menu->holiday = array('link' => '节假日|holiday|browse|'); $lang->system->menu->custom = array('link' => '自定义|custom|concept|'); - $lang->system->subMenu->setmodel->cmmi ='cmmi|custom|setcmmi|'; $lang->mainNav->system = ' 组织|subject|browse|'; unset($lang->system->dividerMenu); } @@ -174,6 +167,9 @@ $lang->stage->menu = new stdclass(); $lang->stage->menu->browse = array('link' => '阶段列表|stage|browse|', 'alias' => 'create,edit,batchcreate'); $lang->stage->menu->settype = '阶段类型|stage|settype|'; +$lang->measurement = new stdclass(); +$lang->measurement->menu = new stdclass(); + /* 查询条中可以选择的对象列表。*/ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = "{$lang->storyCommon}"; diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index fa2b4a1c97..e2cfbb1c78 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -15,6 +15,7 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile; app->loadConfig('sso');?> sso->redirect)) js::set('ssoRedirect', $config->sso->redirect);?> navGroup, $app->rawModule) == 'program');?> +navGroup, $app->rawModule) == 'system');?>