From 2e5922b9799300b8701ec1f3f05992d2d72b16fa Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 26 May 2025 13:40:49 +0800 Subject: [PATCH] * [bug#62813,done,1h] add custom-project to priv setting. --- module/custom/lang/de.php | 1 + module/custom/lang/en.php | 1 + module/custom/lang/fr.php | 1 + module/custom/lang/zh-cn.php | 1 + module/group/lang/resource.php | 2 ++ module/group/packagemanager.php | 1 + 6 files changed, 7 insertions(+) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index fceb862f67..25d5846cf8 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -55,6 +55,7 @@ $lang->custom->role = 'Role'; $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; +$lang->custom->projectCommon = $lang->projectCommon . ' Setting'; $lang->custom->executionCommon = 'Execution'; $lang->custom->selectDefaultProgram = 'Please select default program'; $lang->custom->defaultProgram = 'Default program'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 04a80eb86a..abaaaf6ed1 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -55,6 +55,7 @@ $lang->custom->role = 'Role'; $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; +$lang->custom->projectCommon = $lang->projectCommon . ' Setting'; $lang->custom->executionCommon = 'Execution'; $lang->custom->selectDefaultProgram = 'Please select default program'; $lang->custom->defaultProgram = 'Default program'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 537d988bb6..76b2ad005b 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -55,6 +55,7 @@ $lang->custom->role = 'Role'; $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Activer ou Désactiver le Code'; +$lang->custom->projectCommon = $lang->projectCommon . ' Setting'; $lang->custom->executionCommon = 'Execution'; $lang->custom->selectDefaultProgram = 'Please select default program'; $lang->custom->defaultProgram = 'Default program'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 23d4a0e6cf..51c63b7a3d 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -55,6 +55,7 @@ $lang->custom->role = '职位'; $lang->custom->dept = '部门'; $lang->custom->code = $lang->code; $lang->custom->setCode = '是否启用代号'; +$lang->custom->projectCommon = $lang->projectCommon . '设置'; $lang->custom->executionCommon = '执行'; $lang->custom->selectDefaultProgram = '请选择一个默认项目集'; $lang->custom->defaultProgram = '默认项目集'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index af21d0cf7b..9d005d006f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1605,6 +1605,7 @@ $lang->mail->methodOrder[50] = 'resend'; $lang->resource->custom = new stdclass(); $lang->resource->custom->set = 'set'; $lang->resource->custom->product = 'productName'; +$lang->resource->custom->project = 'projectCommon'; $lang->resource->custom->execution = 'executionCommon'; $lang->resource->custom->required = 'required'; $lang->resource->custom->restore = 'restore'; @@ -1623,6 +1624,7 @@ $lang->resource->custom->limitTaskDate = 'limitTaskDateAction'; $lang->custom->methodOrder[10] = 'set'; $lang->custom->methodOrder[15] = 'product'; +$lang->custom->methodOrder[17] = 'project'; $lang->custom->methodOrder[20] = 'execution'; $lang->custom->methodOrder[25] = 'required'; $lang->custom->methodOrder[30] = 'restore'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index b6ed37982d..16e5400ea1 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3002,6 +3002,7 @@ $config->group->package->commonSetting = new stdclass(); $config->group->package->commonSetting->order = 5; $config->group->package->commonSetting->subset = 'modelconfig'; $config->group->package->commonSetting->privs = array(); +$config->group->package->commonSetting->privs['custom-project'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 1, 'depend' => array(), 'recommend' => array()); $config->group->package->commonSetting->privs['stage-setType'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array(), 'recommend' => array()); $config->group->package->commonSetting->privs['custom-flow'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 35, 'depend' => array('admin-index', 'admin-register'), 'recommend' => array()); $config->group->package->commonSetting->privs['custom-estimate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 50, 'depend' => array(), 'recommend' => array());