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

Merge branch 'tsj_fixbug' into 'master'

Browse Source 
Tsj fixbug

See merge request easycorp/zentaopms!7015
This commit is contained in:
孙广明
2023-02-21 08:21:13 +00:00
parent 6b241f1d06 8d2abc483d
commit 3685a40ca7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/group/ext/lang/resource.php
+1 -1
View File
@@ -649,7 +649,7 @@ $lang->resource->custom = new stdclass();
$lang->resource->custom->index = 'index';
$lang->resource->custom->set = 'set';
$lang->resource->custom->product = 'productName';
$lang->resource->custom->execution = 'execution';
$lang->resource->custom->execution = 'executionCommon';
$lang->resource->custom->required = 'required';
$lang->resource->custom->restore = 'restore';
$lang->resource->custom->flow = 'flow';
module/admin/lang/menu.php
+4 -1
View File
@@ -186,8 +186,11 @@ if($config->edition != 'max')
if(!helper::hasFeature('waterfall'))
{
unset($lang->admin->menuList->model['subMenu']['waterfall']);
unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
unset($lang->admin->menuList->model['menuOrder']['15']);
}
if(!helper::hasFeature('waterfallplus'))
{
unset($lang->admin->menuList->model['subMenu']['waterfallplus']);
unset($lang->admin->menuList->model['menuOrder']['25']);
}
if($config->edition == 'max')