From dfb7a44f24a4e7e09727eb84fd3d165badc6f1c0 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 25 Nov 2024 13:49:15 +0800 Subject: [PATCH] * [task#132850,doing,0.3h,2h] Adjust the permissions of the project approval permission package. --- db/charter.sql | 2 ++ module/group/packagemanager.php | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/db/charter.sql b/db/charter.sql index 8fa36de8db..241debfff7 100644 --- a/db/charter.sql +++ b/db/charter.sql @@ -21,3 +21,5 @@ INSERT INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `vision` ('lang', '立项关闭原因', 'charterCloseReason', '1', 'rnd', 'admin', '1970-01-01 00:00:01', 'charterCloseReason', '', '', ''), ('lang', '立项审批结果', 'charterReviewResult', '1', 'rnd', 'admin', '1970-01-01 00:00:01', 'charterReviewResult', '', '', ''), ('lang', '立项审批状态', 'charterReviewStatus', '1', 'rnd', 'admin', '1970-01-01 00:00:01', 'charterReviewStatus', '', '', ''); + +UPDATE `zt_grouppriv` SET `method`='activateProjectApproval' WHERE `module`='charter' AND `method`='activate'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index c206a340a8..781ce1a706 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3719,15 +3719,20 @@ $config->group->package->manageCharter->subset = 'charter'; $config->group->package->manageCharter->privs = array(); $config->group->package->manageCharter->privs['charter-create'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 20, 'depend' => array('charter-browse'), 'recommend' => array('charter-delete', 'charter-edit')); $config->group->package->manageCharter->privs['charter-edit'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 30, 'depend' => array('charter-browse', 'charter-loadRoadmapStories', 'charter-view'), 'recommend' => array('charter-create', 'charter-delete')); -$config->group->package->manageCharter->privs['charter-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 50, 'depend' => array('charter-browse', 'charter-view'), 'recommend' => array()); -$config->group->package->manageCharter->privs['charter-close'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 80, 'depend' => array('charter-browse', 'charter-view'), 'recommend' => array('charter-activate', 'charter-create', 'charter-edit')); -$config->group->package->manageCharter->privs['charter-activate'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 90, 'depend' => array('charter-browse', 'charter-view'), 'recommend' => array('charter-close', 'charter-create', 'charter-edit')); +$config->group->package->manageCharter->privs['charter-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 50, 'depend' => array('charter-view'), 'recommend' => array()); +$config->group->package->manageCharter->privs['charter-close'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 80, 'depend' => array('charter-browse'), 'recommend' => array('charter-create', 'charter-edit')); $config->group->package->reviewCharter = new stdclass(); $config->group->package->reviewCharter->order = 5; $config->group->package->reviewCharter->subset = 'charter'; $config->group->package->reviewCharter->privs = array(); -$config->group->package->reviewCharter->privs['charter-review'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 60, 'depend' => array('charter-browse', 'charter-loadRoadmapStories', 'charter-view'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-projectApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 10, 'depend' => array('charter-browse'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-completionApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 15, 'depend' => array('charter-browse'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-cancelProjectApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 20, 'depend' => array('charter-view'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-activateProjectApproval'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 25, 'depend' => array('charter-browse'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-approvalcancel'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 30, 'depend' => array('charter-browse'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-review'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 35, 'depend' => array('charter-browse'), 'recommend' => array()); +$config->group->package->reviewCharter->privs['charter-approvalProgress'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd', 'order' => 40, 'depend' => array('charter-browse'), 'recommend' => array()); $config->group->package->browseDemand = new stdclass(); $config->group->package->browseDemand->order = 5;