Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-03-17 15:27:15 +08:00
parent 8a29b09b3f e279dff340
commit eb618d1dcd
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/zh-cn.php
+3 -3
View File
@@ -160,14 +160,14 @@ $lang->program->homeMenu = new stdclass();
$lang->program->homeMenu->browse = array('link' => '项目集|program|browse|');
$lang->project = new stdclass();
$lang->project->menu = new stdclass();
$lang->project->homeMenu = new stdclass();
if($config->systemMode == 'new')
{
$lang->project->menu->browse = array('link' => '项目|project|browse|');
$lang->project->homeMenu->browse = array('link' => '项目|project|browse|');
}
else
{
$lang->project->menu->browse = array('link' => "$lang->executionCommon|project|browse|");
$lang->project->homeMenu->browse = array('link' => "$lang->executionCommon|project|browse|");
}
$lang->project->dividerMenu = ',execution,programplan,doc,dynamic,';
module/common/model.php
+16 -15
View File
@@ -2289,19 +2289,6 @@ EOD;
{
global $lang, $config;
if($openApp == 'project')
{
if($config->systemMode == 'classic' or ($moduleName == 'project' and $methodName == 'browse'))
{
$lang->menu = $lang->project->menu;
}
else
{
$lang->menu = self::getProjectMainMenu($moduleName);
}
return;
}
if(!isset($lang->$openApp->homeMenu))
{
$lang->menu = $lang->$openApp->menu;
@@ -2327,8 +2314,22 @@ EOD;
}
}
$lang->menu = $lang->$openApp->menu;
$lang->menuOrder = $lang->$openApp->menuOrder;
if($openApp == 'project')
{
if($config->systemMode == 'classic' or ($moduleName == 'project' and $methodName == 'browse'))
{
$lang->menu = $lang->project->homeMenu;
}
else
{
$lang->menu = self::getProjectMainMenu($moduleName);
}
}
else
{
$lang->menu = $lang->$openApp->menu;
$lang->menuOrder = $lang->$openApp->menuOrder;
}
}
/**