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

Merge branch 'master_xieqiyu_22496' into 'master'

Browse Source 
* Fix bug#22496.

See merge request easycorp/zentaopms!3429
This commit is contained in:
王怡栋
2022-05-16 09:27:22 +00:00
parent 3cd2d727a7 c01b9f54cf
commit f565477c52
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+2 -6
View File
@@ -470,9 +470,7 @@ $lang->resource->branch->edit = 'editAction';
$lang->resource->branch->close = 'closeAction';
$lang->resource->branch->activate = 'activateAction';
$lang->resource->branch->sort = 'sort';
$lang->resource->branch->delete = 'delete';
$lang->resource->branch->batchEdit = 'batchEdit';
$lang->resource->branch->setDefault = 'setDefaultAction';
$lang->resource->branch->mergeBranch = 'mergeBranchAction';
$lang->branch->methodOrder[0] = 'manage';
@@ -481,10 +479,8 @@ $lang->branch->methodOrder[10] = 'edit';
$lang->branch->methodOrder[15] = 'close';
$lang->branch->methodOrder[20] = 'activate';
$lang->branch->methodOrder[25] = 'sort';
$lang->branch->methodOrder[30] = 'delete';
$lang->branch->methodOrder[35] = 'batchEdit';
$lang->branch->methodOrder[40] = 'setDefault';
$lang->branch->methodOrder[45] = 'mergeBranch';
$lang->branch->methodOrder[30] = 'batchEdit';
$lang->branch->methodOrder[35] = 'mergeBranch';
/* Story. */
$lang->resource->story = new stdclass();