From 89c8fd742e26596a545a80469f402b3f0b7912ab Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 15 Nov 2024 03:36:15 +0000 Subject: [PATCH] * [task#131767,doing,2h] Add privileges. --- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/doc/lang/de.php | 8 ++++++++ module/doc/lang/en.php | 8 ++++++++ module/doc/lang/fr.php | 8 ++++++++ module/doc/lang/zh-cn.php | 8 +++++++- module/doc/ui/templatelist.html.php | 11 +++++++---- module/group/lang/de.php | 3 +++ module/group/lang/en.php | 3 +++ module/group/lang/fr.php | 3 +++ module/group/lang/zh-cn.php | 3 +++ module/group/packagemanager.php | 26 +++++++++++++++++++++----- 14 files changed, 75 insertions(+), 14 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index aad6a05a95..fcde04ca8a 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -289,7 +289,7 @@ $lang->systemsetting->common = 'System setting'; $lang->staffmanage->common = 'User management'; $lang->modelconfig->common = 'Pattern setting'; $lang->featureconfig->common = 'Features config'; -$lang->doctemplate->common = 'Doc template'; +$lang->doctemplate->common = 'Template Square'; $lang->notifysetting->common = 'Notification'; $lang->bidesign->common = 'BI design'; $lang->personalsettings->common = 'Personal setting '; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index ac7fff3726..66d2871259 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -289,7 +289,7 @@ $lang->systemsetting->common = 'System setting'; $lang->staffmanage->common = 'User management'; $lang->modelconfig->common = 'Pattern setting'; $lang->featureconfig->common = 'Features config'; -$lang->doctemplate->common = 'Doc template'; +$lang->doctemplate->common = 'Template Square'; $lang->notifysetting->common = 'Notification'; $lang->bidesign->common = 'BI design'; $lang->personalsettings->common = 'Personal setting '; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index ecc2abd027..fdc3d6c40a 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -289,7 +289,7 @@ $lang->systemsetting->common = 'System setting'; $lang->staffmanage->common = 'User management'; $lang->modelconfig->common = 'Pattern setting'; $lang->featureconfig->common = 'Features config'; -$lang->doctemplate->common = 'Doc template'; +$lang->doctemplate->common = 'Template Square'; $lang->notifysetting->common = 'Notification'; $lang->bidesign->common = 'BI design'; $lang->personalsettings->common = 'Personal setting '; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 069e97f532..a47d9728da 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -289,7 +289,7 @@ $lang->systemsetting->common = '系统设置'; $lang->staffmanage->common = '人员管理'; $lang->modelconfig->common = '模型配置'; $lang->featureconfig->common = '功能配置'; -$lang->doctemplate->common = '文档模板'; +$lang->doctemplate->common = '模板广场'; $lang->notifysetting->common = '通知设置'; $lang->bidesign->common = 'BI设计'; $lang->personalsettings->common = '个人设置'; diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 63b453a17a..23d466e37e 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -495,6 +495,14 @@ $lang->doc->projectFilterTypes[] = array('mine', 'Involved'); $lang->doc->spaceFilterTypes[] = array('all', 'All'); +$lang->doc->browseTemplate = 'Template Square'; +$lang->doc->createTemplate = 'Create Document Template'; +$lang->doc->editTemplate = 'Edit Document Template'; +$lang->doc->deleteTemplate = 'Delete Document Template'; +$lang->doc->addTemplateType = 'Create Type'; +$lang->doc->editTemplateType = 'Edit Type'; +$lang->doc->deleteTemplateType = 'Delete Type'; + $lang->doc->docLang = new stdClass(); $lang->doc->docLang->cancel = $lang->cancel; $lang->doc->docLang->export = $lang->export; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 47eeaf6157..f6b8cd3b54 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -495,6 +495,14 @@ $lang->doc->projectFilterTypes[] = array('mine', 'Involved'); $lang->doc->spaceFilterTypes[] = array('all', 'All'); +$lang->doc->browseTemplate = 'Template Square'; +$lang->doc->createTemplate = 'Create Document Template'; +$lang->doc->editTemplate = 'Edit Document Template'; +$lang->doc->deleteTemplate = 'Delete Document Template'; +$lang->doc->addTemplateType = 'Create Type'; +$lang->doc->editTemplateType = 'Edit Type'; +$lang->doc->deleteTemplateType = 'Delete Type'; + $lang->doc->docLang = new stdClass(); $lang->doc->docLang->cancel = $lang->cancel; $lang->doc->docLang->export = $lang->export; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 431b78260c..8c601ac16f 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -495,6 +495,14 @@ $lang->doc->projectFilterTypes[] = array('mine', 'Involved'); $lang->doc->spaceFilterTypes[] = array('all', 'All'); +$lang->doc->browseTemplate = 'Template Square'; +$lang->doc->createTemplate = 'Create Document Template'; +$lang->doc->editTemplate = 'Edit Document Template'; +$lang->doc->deleteTemplate = 'Delete Document Template'; +$lang->doc->addTemplateType = 'Create Type'; +$lang->doc->editTemplateType = 'Edit Type'; +$lang->doc->deleteTemplateType = 'Delete Type'; + $lang->doc->docLang = new stdClass(); $lang->doc->docLang->cancel = $lang->cancel; $lang->doc->docLang->export = $lang->export; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 78dadc719c..7e3d3e7489 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -495,7 +495,13 @@ $lang->doc->projectFilterTypes[] = array('mine', '我参与的'); $lang->doc->spaceFilterTypes[] = array('all', '全部'); -$lang->doc->browseTemplate = '文档模板'; +$lang->doc->browseTemplate = '模板广场'; +$lang->doc->createTemplate = '创建文档模板'; +$lang->doc->editTemplate = '编辑文档模板'; +$lang->doc->deleteTemplate = '删除文档模板'; +$lang->doc->addTemplateType = '添加类型'; +$lang->doc->editTemplateType = '编辑类型'; +$lang->doc->deleteTemplateType = '删除类型'; $lang->doc->docLang = new stdClass(); $lang->doc->docLang->cancel = $lang->cancel; diff --git a/module/doc/ui/templatelist.html.php b/module/doc/ui/templatelist.html.php index 45dcfe2a78..4ba8bdb091 100644 --- a/module/doc/ui/templatelist.html.php +++ b/module/doc/ui/templatelist.html.php @@ -17,10 +17,13 @@ foreach($config->doc->templateMenu as $item) $data['libs'][] = $item + array('sp $data['modules'] = $this->doc->getTemplateModules(); $privs = array(); -$privs['create'] = hasPriv('docTemplate', 'create'); -$privs['edit'] = hasPriv('docTemplate ', 'edit'); -$privs['delete'] = hasPriv('docTemplate ', 'delete'); -$privs['collect'] = 'no'; +$privs['create'] = hasPriv('doc', 'createTemplate'); +$privs['edit'] = hasPriv('doc', 'editTemplate'); +$privs['delete'] = hasPriv('doc', 'deleteTemplate'); +$privs['addModule'] = hasPriv('doc', 'addTemplateType'); +$privs['editModule'] = hasPriv('doc', 'editTemplateType'); +$privs['deleteModule'] = hasPriv('doc', 'deleteTemplateType'); +$privs['collect'] = 'no'; $filterTypes = $lang->docTemplate->filterTypes; if(!hasPriv('doc', 'editDocTemplate')) $filterTypes = array_values(array_filter($filterTypes, function($item){ return $item[0] != 'draft'; })); diff --git a/module/group/lang/de.php b/module/group/lang/de.php index eb58846536..9ed0b99fa0 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -537,6 +537,9 @@ $lang->group->package->browseDoc = 'Browse Doc'; $lang->group->package->manageDoc = 'Manage Doc'; $lang->group->package->deleteDoc = 'Delete Doc'; $lang->group->package->exportDoc = 'Export Doc'; +$lang->group->package->browseDoctemplate = 'Browse Doc Template'; +$lang->group->package->manageDoctemplate = 'Manage Doc Template'; +$lang->group->package->deleteDoctemplate = 'Delete Doc Template'; $lang->group->package->browseAPI = 'Browse API'; $lang->group->package->manageAPI = 'Manage API'; $lang->group->package->exportAPI = 'Export API'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index e55e96983b..db7ff415f2 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -536,6 +536,9 @@ $lang->group->package->manageMetric = 'Manage Metric'; $lang->group->package->browseDoc = 'Browse Doc'; $lang->group->package->manageDoc = 'Manage Doc'; $lang->group->package->deleteDoc = 'Delete Doc'; +$lang->group->package->browseDoctemplate = 'Browse Doc Template'; +$lang->group->package->manageDoctemplate = 'Manage Doc Template'; +$lang->group->package->deleteDoctemplate = 'Delete Doc Template'; $lang->group->package->exportDoc = 'Export Doc'; $lang->group->package->browseAPI = 'Browse API'; $lang->group->package->manageAPI = 'Manage API'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 4628b085fc..2e91e5118f 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -536,6 +536,9 @@ $lang->group->package->manageMetric = 'Manage Metric'; $lang->group->package->browseDoc = 'Browse Doc'; $lang->group->package->manageDoc = 'Manage Doc'; $lang->group->package->deleteDoc = 'Delete Doc'; +$lang->group->package->browseDoctemplate = 'Browse Doc Template'; +$lang->group->package->manageDoctemplate = 'Manage Doc Template'; +$lang->group->package->deleteDoctemplate = 'Delete Doc Template'; $lang->group->package->exportDoc = 'Export Doc'; $lang->group->package->browseAPI = 'Browse API'; $lang->group->package->manageAPI = 'Manage API'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index fe6bf5ccf6..84391f9f4b 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -537,6 +537,9 @@ $lang->group->package->browseDoc = '浏览文档'; $lang->group->package->manageDoc = '创建与维护文档'; $lang->group->package->deleteDoc = '删除文档'; $lang->group->package->exportDoc = '导出文档'; +$lang->group->package->browseDoctemplate = '浏览文档模板'; +$lang->group->package->manageDoctemplate = '创建与维护文档模板'; +$lang->group->package->deleteDoctemplate = '删除文档模板'; $lang->group->package->browseAPI = '浏览接口空间'; $lang->group->package->manageAPI = '创建维护接口'; $lang->group->package->exportAPI = '导出接口'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 49dcfea730..98d8819c92 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -2916,11 +2916,27 @@ $config->group->package->commonEffort->subset = 'generaleffort'; $config->group->package->commonEffort->privs = array(); $config->group->package->commonEffort->privs['effort-createForObject'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 3, 'depend' => array(), 'recommend' => array('effort-delete', 'effort-edit')); -$config->group->package->docTemplate = new stdclass(); -$config->group->package->docTemplate->order = 5; -$config->group->package->docTemplate->subset = 'doctemplate'; -$config->group->package->docTemplate->privs = array(); -$config->group->package->docTemplate->privs['doc-browseTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); +$config->group->package->browseDoctemplate = new stdclass(); +$config->group->package->browseDoctemplate->order = 5; +$config->group->package->browseDoctemplate->subset = 'doctemplate'; +$config->group->package->browseDoctemplate->privs = array(); +$config->group->package->browseDoctemplate->privs['doc-browseTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); + +$config->group->package->manageDoctemplate = new stdclass(); +$config->group->package->manageDoctemplate->order = 15; +$config->group->package->manageDoctemplate->subset = 'doctemplate'; +$config->group->package->manageDoctemplate->privs = array(); +$config->group->package->manageDoctemplate->privs['doc-createTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-editTemplate')); +$config->group->package->manageDoctemplate->privs['doc-editTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-createTemplate')); +$config->group->package->manageDoctemplate->privs['doc-addTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-editTemplateType')); +$config->group->package->manageDoctemplate->privs['doc-editTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-addTemplateType')); +$config->group->package->manageDoctemplate->privs['doc-deleteTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('')); + +$config->group->package->deleteDoctemplate = new stdclass(); +$config->group->package->deleteDoctemplate->order = 20; +$config->group->package->deleteDoctemplate->subset = 'doctemplate'; +$config->group->package->deleteDoctemplate->privs = array(); +$config->group->package->deleteDoctemplate->privs['doc-deleteTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('doc-browseTemplate'), 'recommend' => array()); $config->group->package->projectStakeholder = new stdclass(); $config->group->package->projectStakeholder->order = 5;