From aedc9b29030c59b8df9beab4bdd847069bba8558 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 2 Sep 2025 09:05:54 +0800 Subject: [PATCH] * [task#149130,done,1h,0h] Finish review admin group. --- config/zentaopms.php | 2 +- module/admin/model.php | 4 ++++ module/group/packagemanager.php | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index d1b8dc4c2c..e8bf85b4b1 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -788,7 +788,7 @@ $config->featureGroup->other = array('devops', 'kanban', 'setCode'); $config->db->sqliteBlacklist = array('sqlite_queue', 'cron'); $config->hasDropmenuApps = array('program', 'project', 'product', 'execution', 'qa', 'admin', 'bi', 'feedback', 'demandpool'); -$config->hasBranchMenuModules = array('product', 'story', 'release', 'bug', 'testcase', 'testtask', 'branch', 'tree', 'workflowgroup', 'deliverable', 'process', 'activity'); +$config->hasBranchMenuModules = array('product', 'story', 'release', 'bug', 'testcase', 'testtask', 'branch', 'tree', 'workflowgroup', 'deliverable', 'process', 'activity', 'review'); $config->excludeBranchMenu = array('product-dashboard', 'product-view', 'product-whitelist', 'product-addwhitelist', 'branch-manage', 'branch-batchedit'); $config->excludeDropmenuList = array('program-browse', 'program-productview', 'program-kanban', 'product-all', 'product-index', 'product-kanban', 'project-kanban', 'execution-all', 'execution-executionkanban', 'project-browse', 'project-template', 'project-createtemplate', 'project-batchedit', 'product-batchedit', 'admin-index', 'product-create', 'project-create', 'execution-create', 'program-create', 'execution-batchedit', 'metric-preview', 'metric-browse', 'metric-view', 'metriclib-browse', 'qa-index', 'caselib-create', 'feedback-batchedit', 'feedback-batchclose', 'feedback-showimport', 'dimension-browse', 'dataview-browse', 'dataview-create', 'dataview-query', 'ticket-batchedit', 'ticket-batchfinish', 'ticket-batchactivate', 'file-download'); $config->hasSwitcherModules = array('design'); diff --git a/module/admin/model.php b/module/admin/model.php index 8817b58292..f4facb0f8d 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -134,8 +134,12 @@ class adminModel extends model if($firstParam == $subMenuKey) $subModule = 'custom'; } + /* 针对项目流程和产品流程菜单做特殊处理。 */ if(in_array($menuKey, array('projectflow', 'productflow')) && $groupID) { + $workflowGroup = $this->fetchByID($groupID, 'workflowgroup'); + if($subMenuKey == 'review' && $workflowGroup->projectModel == 'kanban') continue; + $subMenu['link'] = sprintf($subMenu['link'], $groupID); if(isset($subMenu['subMenu'])) { diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 6e08679845..4c4033150e 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -2194,6 +2194,7 @@ $config->group->package->manageReview->order = 10; $config->group->package->manageReview->subset = 'projectreview'; $config->group->package->manageReview->privs = array(); $config->group->package->manageReview->privs['review-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('project-index'), 'recommend' => array('review-view')); +$config->group->package->manageReview->privs['review-admin'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); $config->group->package->manageReview->privs['review-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('review-browse'), 'recommend' => array('review-edit', 'review-recall', 'review-report', 'review-submit', 'review-toAudit')); $config->group->package->manageReview->privs['review-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('review-browse'), 'recommend' => array('review-create', 'review-delete', 'review-recall', 'review-report', 'review-submit', 'review-toAudit')); $config->group->package->manageReview->privs['review-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('review-browse'), 'recommend' => array());