Merge branch 'fixbug' into 'master'
* Fix bug #24340. See merge request easycorp/zentaopms!4154
This commit is contained in:
@@ -81,6 +81,7 @@ $lang->retrack = 'Retrack';
|
||||
$lang->whitelist = 'Weiße Liste';
|
||||
$lang->globalSetting = 'Global Setting';
|
||||
$lang->waterfallModel = 'Waterfall';
|
||||
$lang->scrumModel = 'Scrum';
|
||||
$lang->all = 'All';
|
||||
$lang->viewDetails = 'View Details';
|
||||
|
||||
|
||||
@@ -81,6 +81,7 @@ $lang->retrack = 'Retrack';
|
||||
$lang->whitelist = 'Access whitelist';
|
||||
$lang->globalSetting = 'Global Setting';
|
||||
$lang->waterfallModel = 'Waterfall';
|
||||
$lang->scrumModel = 'Scrum';
|
||||
$lang->all = 'All';
|
||||
$lang->viewDetails = 'View Details';
|
||||
|
||||
|
||||
@@ -81,6 +81,7 @@ $lang->retrack = 'Réduire';
|
||||
$lang->whitelist = 'Liste blanche';
|
||||
$lang->globalSetting = 'Global Setting';
|
||||
$lang->waterfallModel = 'Waterfall';
|
||||
$lang->scrumModel = 'Scrum';
|
||||
$lang->all = 'All';
|
||||
$lang->viewDetails = 'View Details';
|
||||
|
||||
|
||||
@@ -491,6 +491,9 @@ $lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|i
|
||||
|
||||
$lang->admin->menu->model['dropMenu'] = new stdclass();
|
||||
$lang->admin->menu->model['dropMenu']->allModel = array('link' => "{$lang->globalSetting}|custom|browsestoryconcept|", 'subModule' => 'measurement,report,sqlbuilder,subject,custom,meetingroom,baseline');
|
||||
|
||||
if($config->edition == 'max') $lang->admin->menu->model['dropMenu']->scrum = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|processID=0&browseType=scrum", 'subModule' => 'auditcl,process,activity,zoutput,classify,');
|
||||
|
||||
if($config->systemMode == 'new')
|
||||
{
|
||||
$lang->admin->menu->model['dropMenu']->waterfall = array('link' => "{$lang->waterfallModel}|stage|setType|", 'subModule' => 'stage,auditcl,cmcl,process,activity,zoutput,classify,reviewcl,reviewsetting');
|
||||
|
||||
@@ -81,6 +81,7 @@ $lang->retrack = '收起';
|
||||
$lang->whitelist = '访问白名单';
|
||||
$lang->globalSetting = '全局设置';
|
||||
$lang->waterfallModel = '瀑布模型';
|
||||
$lang->scrumModel = '敏捷模型';
|
||||
$lang->all = '所有';
|
||||
$lang->viewDetails = '查看详情';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user