Merge branch 'sprint/221_dongli_62948' into 'master'

* Finish task #62948

See merge request easycorp/zentaopms!4796
This commit is contained in:
胡方舟
2022-08-04 06:17:11 +00:00
2 changed files with 4 additions and 5 deletions
+1
View File
@@ -222,6 +222,7 @@ $config->openMethods[] = 'kanban.deleteobjectcard';
$config->openMethods[] = 'admin.ignore';
$config->openMethods[] = 'personnel.unbindwhitelist';
$config->openMethods[] = 'tree.viewhistory';
$config->openMethods[] = 'project.createguide';
/* Define the tables. */
define('TABLE_COMPANY', '`' . $config->db->prefix . 'company`');
+3 -5
View File
@@ -264,7 +264,6 @@ if($config->systemMode == 'new')
$lang->resource->project->testreport = 'testreport';
$lang->resource->project->execution = 'execution';
$lang->resource->project->export = 'export';
$lang->resource->project->createGuide = 'createGuide';
$lang->resource->project->updateOrder = 'updateOrder';
$lang->resource->project->team = 'teamAction';
$lang->resource->project->unlinkMember = 'unlinkMember';
@@ -304,10 +303,9 @@ if($config->systemMode == 'new')
$lang->project->methodOrder[160] = 'testreport';
$lang->project->methodOrder[165] = 'execution';
$lang->project->methodOrder[170] = 'export';
$lang->project->methodOrder[175] = 'createGuide';
$lang->project->methodOrder[180] = 'updateOrder';
$lang->project->methodOrder[185] = 'team';
$lang->project->methodOrder[190] = 'unlinkMember';
$lang->project->methodOrder[175] = 'updateOrder';
$lang->project->methodOrder[180] = 'team';
$lang->project->methodOrder[185] = 'unlinkMember';
$lang->resource->projectbuild = new stdclass();
$lang->resource->projectbuild->browse = 'browse';