From 40f2dac16d1e3fc151fb04c7f0d6c09209d493cd Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 14 Feb 2025 09:14:59 +0000 Subject: [PATCH] * [bug#59634,done,2h] Check add module privilege. --- lib/zin/wg/docapp/js/v1.js | 3 ++- module/doc/js/browsetemplate.ui.js | 2 +- module/doc/lang/de.php | 10 ++++++---- module/doc/lang/en.php | 10 ++++++---- module/doc/lang/fr.php | 10 ++++++---- module/doc/lang/zh-cn.php | 10 ++++++---- module/doc/ui/templatelist.html.php | 6 ++++++ 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/lib/zin/wg/docapp/js/v1.js b/lib/zin/wg/docapp/js/v1.js index bcb756ac99..656ea1d93a 100644 --- a/lib/zin/wg/docapp/js/v1.js +++ b/lib/zin/wg/docapp/js/v1.js @@ -762,10 +762,11 @@ const actionsMap = */ lib: function(info) { + const docApp = getDocApp(); const lang = getLang(); const items = []; const lib = info.data; - const canModify = canModifySpace(); + const canModify = canModifySpace() || docApp === null; const canAddModule = canModify && hasPriv('addModule'); /* 获取侧边栏没有模块时的操作按钮。 Get actions when sidebar no module. */ diff --git a/module/doc/js/browsetemplate.ui.js b/module/doc/js/browsetemplate.ui.js index 35e7503917..11fdecbb55 100644 --- a/module/doc/js/browsetemplate.ui.js +++ b/module/doc/js/browsetemplate.ui.js @@ -307,7 +307,7 @@ $.extend(window.docAppActions, const items = []; const module = info.data; - if(docAppHasPriv('addModule')) items.push({text: getDocAppLang('addModule'), command: `addModule/${module.root}/${module.parent}`}); + if(docAppHasPriv('addModule')) items.push({text: getDocAppLang('addSameModule'), command: `addModule/${module.root}/${module.parent}`}); if(module.grade == 1 && docAppHasPriv('editModule')) items.push({text: getDocAppLang('addSubModule'), command: `addModule/${module.root}/${module.id}`}); if(docAppHasPriv('editModule')) items.push({text: getDocAppLang('editModule'), command: `editModule/${module.id}`}); if(docAppHasPriv('deleteModule')) items.push({text: getDocAppLang('deleteModule'), command: `deleteModule/${module.id}`}); diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 44312c9c67..3ed4bd550c 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -109,10 +109,12 @@ $lang->docTemplate->scopeLabel = 'Scope'; $lang->docTemplate->noTemplate = 'No Doc Template'; $lang->docTemplate->noDesc = 'No Desc'; -$lang->docTemplate->addModule = 'Add Template type'; -$lang->docTemplate->addSubModule = 'Add Sub Template type'; -$lang->docTemplate->editModule = 'Edit Template type'; -$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->addModule = 'Add Template type'; +$lang->docTemplate->addSameModule = 'Add Same Template type'; +$lang->docTemplate->addSubModule = 'Add Sub Template type'; +$lang->docTemplate->editModule = 'Edit Template type'; +$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->noModules = 'No Modules'; $lang->docTemplate->scopes = array(); $lang->docTemplate->scopes[1] = 'Product'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 3cc5329da5..d978b41027 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -110,10 +110,12 @@ $lang->docTemplate->scopeLabel = 'Scope'; $lang->docTemplate->noTemplate = 'No Doc Template'; $lang->docTemplate->noDesc = 'No Desc'; -$lang->docTemplate->addModule = 'Add Template type'; -$lang->docTemplate->addSubModule = 'Add Sub Template type'; -$lang->docTemplate->editModule = 'Edit Template type'; -$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->addModule = 'Add Template type'; +$lang->docTemplate->addSameModule = 'Add Same Template type'; +$lang->docTemplate->addSubModule = 'Add Sub Template type'; +$lang->docTemplate->editModule = 'Edit Template type'; +$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->noModules = 'No Modules'; $lang->docTemplate->scopes = array(); $lang->docTemplate->scopes[1] = 'Product'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index e181736fca..9b11e1c1ad 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -109,10 +109,12 @@ $lang->docTemplate->scopeLabel = 'Scope'; $lang->docTemplate->noTemplate = 'No Doc Template'; $lang->docTemplate->noDesc = 'No Desc'; -$lang->docTemplate->addModule = 'Add Template type'; -$lang->docTemplate->addSubModule = 'Add Sub Template type'; -$lang->docTemplate->editModule = 'Edit Template type'; -$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->addModule = 'Add Template type'; +$lang->docTemplate->addSameModule = 'Add Same Template type'; +$lang->docTemplate->addSubModule = 'Add Sub Template type'; +$lang->docTemplate->editModule = 'Edit Template type'; +$lang->docTemplate->deleteModule = 'Delete Template type'; +$lang->docTemplate->noModules = 'No Modules'; $lang->docTemplate->scopes = array(); $lang->docTemplate->scopes[1] = 'Product'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index e09d77a4ec..47752cfca4 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -110,10 +110,12 @@ $lang->docTemplate->create = '创建模板'; $lang->docTemplate->edit = '编辑模板'; $lang->docTemplate->delete = '删除模板'; -$lang->docTemplate->addModule = '添加同级类型'; -$lang->docTemplate->addSubModule = '添加子类型'; -$lang->docTemplate->editModule = '编辑类型'; -$lang->docTemplate->deleteModule = '删除类型'; +$lang->docTemplate->addModule = '添加类型'; +$lang->docTemplate->addSameModule = '添加同级类型'; +$lang->docTemplate->addSubModule = '添加子类型'; +$lang->docTemplate->editModule = '编辑类型'; +$lang->docTemplate->deleteModule = '删除类型'; +$lang->docTemplate->noModules = '没有类型'; $lang->docTemplate->scopes = array(); $lang->docTemplate->scopes[1] = '产品'; diff --git a/module/doc/ui/templatelist.html.php b/module/doc/ui/templatelist.html.php index 56cf465ab5..3a8eb1a9ec 100644 --- a/module/doc/ui/templatelist.html.php +++ b/module/doc/ui/templatelist.html.php @@ -64,6 +64,12 @@ $langData['leaveEditingConfirm'] = $lang->docTemplate->leaveEditingConfirm; $langData['searchLibPlaceholder'] = $lang->docTemplate->searchScopePlaceholder; $langData['searchModulePlaceholder'] = $lang->docTemplate->searchTypePlaceholder; +$langData['actions']['addModule'] = $lang->docTemplate->addModule; +$langData['actions']['addSameModule'] = $lang->docTemplate->addSameModule; +$langData['actions']['addSubModule'] = $lang->docTemplate->addSubModule; +$langData['actions']['editModule'] = $lang->docTemplate->editModule; +$langData['actions']['delModule'] = $lang->docTemplate->deleteModule; + $viewModeUrl = createLink('doc', 'browsetemplate', 'libID={libID}&type={filterType}&docID={docID}&orderBy={orderBy}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}&mode={mode}'); docApp