From bd95b1eb8453fddb44a6804f3eb862b4d05b6cb7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 9 Feb 2023 11:54:01 +0800 Subject: [PATCH] * Code for finish task #83733. --- extension/lite/group/ext/lang/resource.php | 2 +- module/admin/config.php | 2 +- module/admin/lang/menu.php | 2 +- 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/control.php | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index dfd7f33092..476e9d0bcd 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -648,7 +648,7 @@ $lang->mail->methodOrder[65] = 'ztCloud'; $lang->resource->custom = new stdclass(); $lang->resource->custom->index = 'index'; $lang->resource->custom->set = 'set'; -$lang->resource->custom->product = 'product'; +$lang->resource->custom->product = 'productName'; $lang->resource->custom->execution = 'execution'; $lang->resource->custom->restore = 'restore'; $lang->resource->custom->flow = 'flow'; diff --git a/module/admin/config.php b/module/admin/config.php index 4af17ccfdd..d638c28b28 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -28,7 +28,7 @@ if($config->vision == 'lite') $config->admin->menuModuleGroup['model']['custom|set'] = array(); $config->admin->menuModuleGroup['model']['custom|required'] = array('build'); $config->admin->menuModuleGroup['feature']['custom|set'] = array('todo', 'block', 'task', 'story', 'user'); - $config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story', 'doc'); + $config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story', 'doc', 'user'); } $config->admin->plugins[203] = new stdClass(); diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 80ab6703b8..dc785cf7f7 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -89,7 +89,7 @@ $lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$l $lang->admin->menuList->feature['subMenu']['qa'] = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required'); $lang->admin->menuList->feature['subMenu']['kanban'] = array('link' => "{$lang->kanban->common}|custom|kanban|"); $lang->admin->menuList->feature['subMenu']['doc'] = array('link' => "{$lang->doc->common}|custom|required|module=doc", 'exclude' => 'required'); -$lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|set|module=user", 'exclude' => 'set,required'); +$lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|required|module=user", 'links' => array('custom|set|module=user&field=roleList'), 'exclude' => 'set,required'); $lang->admin->menuList->feature['tabMenu']['my']['todo'] = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList", 'exclude' => 'custom-set'); $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed", 'exclude' => 'custom-set'); diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index fbf6305a7e..6b8f57a992 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -160,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type'; $lang->custom->todo->fields['statusList'] = 'Status'; $lang->custom->user = new stdClass(); +$lang->custom->user->fields['required'] = $lang->custom->required; $lang->custom->user->fields['roleList'] = 'Role'; $lang->custom->user->fields['statusList'] = 'Status'; $lang->custom->user->fields['contactField'] = 'Available Contact'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 3650cdc1ca..ac56c928f5 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -160,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type'; $lang->custom->todo->fields['statusList'] = 'Status'; $lang->custom->user = new stdClass(); +$lang->custom->user->fields['required'] = $lang->custom->required; $lang->custom->user->fields['roleList'] = 'Role'; $lang->custom->user->fields['statusList'] = 'Status'; $lang->custom->user->fields['contactField'] = 'Available Contact'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 17390e9a0d..771a21c075 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -160,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type'; $lang->custom->todo->fields['statusList'] = 'Statut'; $lang->custom->user = new stdClass(); +$lang->custom->user->fields['required'] = $lang->custom->required; $lang->custom->user->fields['roleList'] = 'Rôle'; $lang->custom->user->fields['statusList'] = 'Statut'; $lang->custom->user->fields['contactField'] = 'Contact'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index 9a51c381c5..9709f50a47 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -160,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = '类型'; $lang->custom->todo->fields['statusList'] = '状态'; $lang->custom->user = new stdClass(); +$lang->custom->user->fields['required'] = $lang->custom->required; $lang->custom->user->fields['roleList'] = '职位'; $lang->custom->user->fields['statusList'] = '状态'; $lang->custom->user->fields['contactField'] = '可用联系方式'; diff --git a/module/group/control.php b/module/group/control.php index 6885e94cde..f22f559c92 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -236,7 +236,7 @@ class group extends control } $this->lang->custom->common = $this->lang->group->config; - if($this->config->edition == 'max') $this->lang->baseline->common = $this->lang->group->docTemplate; + if($this->config->edition == 'max' and $this->config->vision == 'rnd') $this->lang->baseline->common = $this->lang->group->docTemplate; $this->view->group = $group; $this->view->changelogs = ',' . join(',', $changelog) . ',';