From 0dd9aecee0d434a858a6cf118aad8b483ca1a668 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 19 Jun 2025 13:15:58 +0800 Subject: [PATCH] * [task#145544,done,0.1h,0h] Add project template acl field. --- db/update21.7.2.sql | 2 ++ db/zentao.sql | 2 ++ module/group/packagemanager.php | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 db/update21.7.2.sql diff --git a/db/update21.7.2.sql b/db/update21.7.2.sql new file mode 100644 index 0000000000..fd05c17b26 --- /dev/null +++ b/db/update21.7.2.sql @@ -0,0 +1,2 @@ +ALTER TABLE `zt_project` ADD `templateAcl` char(30) NOT NULL DEFAULT 'open' AFTER `whitelist`; +ALTER TABLE `zt_project` ADD `templateWhite` text NULL AFTER `templateAcl`; diff --git a/db/zentao.sql b/db/zentao.sql index 8c2a88a33f..9c77a0ce20 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1602,6 +1602,8 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `team` varchar(90) NOT NULL DEFAULT '', `acl` char(30) NOT NULL DEFAULT 'open', `whitelist` text NULL, + `templateAcl` char(30) NOT NULL DEFAULT 'open', + `templateWhite` text NULL, `order` mediumint(8) unsigned NOT NULL DEFAULT '0', `vision` varchar(10) NOT NULL DEFAULT 'rnd', `stageBy` enum('project','product') NOT NULL DEFAULT 'product', diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index e44a8e5e3d..48d008b51e 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -1076,7 +1076,8 @@ $config->group->package->projectTemplate->subset = 'projectTemplate'; $config->group->package->projectTemplate->privs = array(); $config->group->package->projectTemplate->privs['project-template'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('project-index')); $config->group->package->projectTemplate->privs['project-createTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('project-index', 'project-template')); -$config->group->package->projectTemplate->privs['project-deleteTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('project-index', 'project-template')); +$config->group->package->projectTemplate->privs['project-templatePriv'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('project-index', 'project-template')); +$config->group->package->projectTemplate->privs['project-deleteTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('project-index', 'project-template')); $config->group->package->browseExecution = new stdclass(); $config->group->package->browseExecution->order = 5;