From ebbb87d900e100f81aaec4f9c1b8e218b2c039a6 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 12 Apr 2023 17:15:02 +0800
Subject: [PATCH] * Fix bug of task #91011, and modify projectbuild to
 projectplan.

---
 config/zentaopms.php           |  4 ++--
 module/group/lang/resource.php | 16 ++++++++--------
 module/project/config.php      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 4992f080bf..78e4fe7fce 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -430,8 +430,8 @@ $config->pipelineTypeList = array('gitlab', 'gogs', 'gitea', 'jenkins', 'sonarqu
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
-$config->programPriv->noSprint      = array('task', 'story', 'tree', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'requirement');
-$config->programPriv->scrum         = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
+$config->programPriv->noSprint      = array('task', 'story', 'tree', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'requirement');
+$config->programPriv->scrum         = array('story', 'requirement', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
 $config->programPriv->waterfall     = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
 $config->programPriv->agileplus     = $config->programPriv->scrum;
 $config->programPriv->waterfallplus = $config->programPriv->waterfall;
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index d90bc4ab29..dbe908fa8d 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -241,9 +241,9 @@ $lang->project->methodOrder[185] = 'manageRepo';
 
 $lang->resource->projectbuild = new stdclass();
 $lang->resource->projectbuild->browse           = 'browse';
+$lang->resource->projectbuild->view             = 'view';
 $lang->resource->projectbuild->create           = 'create';
 $lang->resource->projectbuild->edit             = 'edit';
-$lang->resource->projectbuild->view             = 'view';
 $lang->resource->projectbuild->delete           = 'delete';
 $lang->resource->projectbuild->linkStory        = 'linkStory';
 $lang->resource->projectbuild->unlinkStory      = 'unlinkStory';
@@ -253,9 +253,9 @@ $lang->resource->projectbuild->unlinkBug        = 'unlinkBug';
 $lang->resource->projectbuild->batchUnlinkBug   = 'batchUnlinkBug';
 
 $lang->projectbuild->methodOrder[5]  = 'browse';
-$lang->projectbuild->methodOrder[10] = 'create';
-$lang->projectbuild->methodOrder[15] = 'edit';
-$lang->projectbuild->methodOrder[20] = 'view';
+$lang->projectbuild->methodOrder[10] = 'view';
+$lang->projectbuild->methodOrder[15] = 'create';
+$lang->projectbuild->methodOrder[20] = 'edit';
 $lang->projectbuild->methodOrder[25] = 'delete';
 $lang->projectbuild->methodOrder[30] = 'linkStory';
 $lang->projectbuild->methodOrder[35] = 'unlinkStory';
@@ -270,10 +270,10 @@ $lang->resource->projectplan->create = 'create';
 $lang->resource->projectplan->edit   = 'edit';
 $lang->resource->projectplan->view   = 'view';
 
-$lang->projectbuild->methodOrder[5]  = 'browse';
-$lang->projectbuild->methodOrder[10] = 'create';
-$lang->projectbuild->methodOrder[15] = 'edit';
-$lang->projectbuild->methodOrder[20] = 'view';
+$lang->projectplan->methodOrder[5]  = 'browse';
+$lang->projectplan->methodOrder[10] = 'create';
+$lang->projectplan->methodOrder[15] = 'edit';
+$lang->projectplan->methodOrder[20] = 'view';
 
 /* Project Story. */
 $lang->resource->projectstory = new stdclass();
diff --git a/module/project/config.php b/module/project/config.php
index d8222aed4f..475dbe4d52 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -191,7 +191,7 @@ $config->project->search['params']['closedBy']       = array('operator' => '='
 $config->project->search['params']['lastEditedDate'] = array('operator' => '='      , 'control' => 'input' , 'values' => '', 'class' => 'date');
 $config->project->search['params']['closedDate']     = array('operator' => '='      , 'control' => 'input' , 'values' => '', 'class' => 'date');
 
-$config->project->noSprintPriv['project']    = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'build', 'bug', 'testcase', 'testtask', 'testreport', 'team', 'unlinkMember');
+$config->project->noSprintPriv['project']    = array('edit', 'group', 'createGroup', 'managePriv', 'manageMembers', 'manageGroupMember', 'copyGroup', 'editGroup', 'start', 'suspend', 'close', 'activate', 'delete', 'view', 'whitelist', 'addWhitelist', 'unbindWhitelist', 'manageProducts', 'dynamic', 'bug', 'testcase', 'testtask', 'testreport', 'team', 'unlinkMember');
 $config->project->noSprintPriv['execution']  = array('task', 'grouptask', 'importplanstories', 'importBug', 'story', 'burn', 'computeBurn', 'fixFirst', 'burnData', 'linkStory', 'unlinkStory', 'batchUnlinkStory', 'updateOrder', 'taskKanban', 'printKanban', 'tree', 'treeTask', 'treeStory', 'storyKanban', 'storySort', 'storyEstimate', 'setKanban', 'storyView', 'calendar', 'effortCalendar', 'effort', 'taskEffort', 'computeTaskEffort', 'deleterelation', 'maintainrelation', 'relation', 'gantt', 'ganttsetting', 'ganttEdit');
 $config->project->noSprintPriv['story']      = array('create', 'batchCreate', 'edit', 'export', 'delete', 'view', 'change', 'review', 'batchReview', 'recall', 'close', 'batchClose', 'batchChangePlan', 'batchChangeStage', 'assignTo', 'batchAssignTo', 'activate', 'zeroCase', 'batchEdit', 'import', 'showImport', 'exportTemplate', 'importToLib', 'batchImportToLib', 'relation', 'browse');
 $config->project->noSprintPriv['bug']        = array('create', 'confirmBug', 'view', 'edit', 'assignTo', 'batchAssignTo', 'resolve', 'activate', 'close', 'export', 'confirmStoryChange', 'delete', 'linkBugs', 'import', 'showImport', 'exportTemplate');