From dc4716f95107af75055675311ac0b0017e8e79bb Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Wed, 2 Nov 2022 06:05:18 +0000 Subject: [PATCH 1/2] * Finish task #73845 ~ #73848. --- module/admin/config.php | 2 +- module/admin/control.php | 2 +- module/common/lang/menu.php | 17 +++++++++++++++-- module/group/lang/resource.php | 5 +++++ module/my/lang/de.php | 2 +- module/my/lang/en.php | 2 +- module/my/lang/fr.php | 2 +- module/my/lang/zh-cn.php | 2 +- 8 files changed, 26 insertions(+), 8 deletions(-) diff --git a/module/admin/config.php b/module/admin/config.php index b1cebfbe5b..da7f5c7223 100644 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -19,7 +19,7 @@ $config->admin->module->product = array('roadmap', 'track', 'URStory'); $config->admin->module->scrum = array(); $config->admin->module->waterfall = array('track'); $config->admin->module->assetlib = array('caselib'); -$config->admin->module->other = array('devops', 'kanban', 'oa', 'deploy', 'traincourse'); +$config->admin->module->other = array('devops', 'kanban'); if(!isset($config->safe)) $config->safe = new stdclass(); if(!isset($config->safe->weak)) $config->safe->weak = '123456,password,12345,12345678,qwerty,123456789,1234,1234567,abc123,111111,123123'; diff --git a/module/admin/control.php b/module/admin/control.php index dc8dd3c1b4..593580d84e 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -254,7 +254,7 @@ class admin extends control } $closedFeatures = rtrim($closedFeatures, ','); $this->loadModel('setting')->setItem('system.common.closedFeatures', $closedFeatures); - $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload')); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'top')); } $this->view->title = $this->lang->admin->setModuleIndex; $this->view->closedFeatures = $this->loadModel('setting')->getItem('owner=system&module=common§ion=&key=closedFeatures'); diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index a5d02d4d3a..b9aff5305f 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -777,16 +777,29 @@ $hasProductTrack = strpos(",$config->disabledFeatures,", ',productTrack,') $hasProductRoadmap = strpos(",$config->disabledFeatures,", ',productRoadmap,') === false; $hasScrumAuditplan = strpos(",$config->disabledFeatures,", ',scrumAuditplan,') === false; $hasScrumProcess = strpos(",$config->disabledFeatures,", ',scrumProcess,') === false; -$hasScrumRepo = strpos(",$config->disabledFeatures,", ',scrumRepo,') === false; $hasAssetlibCaselib = strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false; +$hasOtherDevops = strpos(",$config->disabledFeatures,", ',otherDevops,') === false; +$hasOtherKanban = strpos(",$config->disabledFeatures,", ',otherKanban,') === false; if(!$config->URAndSR) unset($lang->product->menu->requirement, $lang->product->menuOrder[35]); if(!$hasProductRoadmap) unset($lang->product->menu->roadmap, $lang->product->menuOrder[30]); if(!$hasProductTrack) unset($lang->product->menu->track, $lang->product->menuOrder[40]); -if(!$hasScrumRepo) unset($lang->scrum->menu->devops, $lang->scrum->menuOrder[25]); if(!$hasWaterfall) unset($lang->admin->menu->model['dropMenu']->waterfall); if(!$hasAssetlibCaselib) unset($lang->qa->menu->caselib); +if(!$hasOtherDevops) +{ + unset($lang->mainNav->devops, $lang->mainNav->menuOrder[35]); + unset($lang->scrum->menu->devops, $lang->scrum->menuOrder[25]); + unset($lang->waterfall->menu->devops, $lang->waterfall->menuOrder[35]); +} + +if(!$hasOtherKanban) +{ + unset($lang->mainNav->kanban, $lang->mainNav->menuOrder[40]); + $lang->dividerMenu = str_replace(',kanban,' , ',doc,', $lang->dividerMenu); +} + if(!$hasScrumAuditplan) { if($hasScrumProcess) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index f4d02ffc60..3fef35bd20 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1897,6 +1897,8 @@ $hasWaterfallTrack = (strpos(",$config->disabledFeatures,", ',waterfallTrack,') $hasWaterfall = (strpos(",$config->disabledFeatures,", ',waterfall,') === false or $inUpgrade); $hasAssetlib = (strpos(",$config->disabledFeatures,", ',assetlib,') === false or $inUpgrade); $hasAssetlibCaselib = (strpos(",$config->disabledFeatures,", ',assetlibCaselib,') === false or $inUpgrade); +$hasOtherDevops = (strpos(",$config->disabledFeatures,", ',otherDevops,') === false or $inUpgrade); +$hasOtherKanban = (strpos(",$config->disabledFeatures,", ',otherKanban,') === false or $inUpgrade); if(!$hasWaterfall) { @@ -1927,4 +1929,7 @@ if(!$hasAssetlib or !$hasAssetlibCaselib) unset($lang->resource->testcase->importToLib); } +if(!$hasOtherDevops) unset($lang->resource->repo); +if(!$hasOtherKanban) unset($lang->resource->kanban); + include (dirname(__FILE__) . '/changelog.php'); diff --git a/module/my/lang/de.php b/module/my/lang/de.php index c5c0ed685b..8ed268a36e 100644 --- a/module/my/lang/de.php +++ b/module/my/lang/de.php @@ -101,7 +101,7 @@ $lang->my->auditMenu->audit->story = 'Story'; $lang->my->auditMenu->audit->testcase = 'Case'; if($config->edition == 'max' and strpos(",$config->disabledFeatures,", ',waterfall,') === false) $lang->my->auditMenu->audit->project = 'Project'; if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback'; -if($config->edition != 'open') $lang->my->auditMenu->audit->oa = 'OA'; +if($config->edition != 'open' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $lang->my->auditMenu->audit->oa = 'OA'; $lang->my->contributeMenu = new stdclass(); $lang->my->contributeMenu->audit = new stdclass(); diff --git a/module/my/lang/en.php b/module/my/lang/en.php index c5c0ed685b..8ed268a36e 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -101,7 +101,7 @@ $lang->my->auditMenu->audit->story = 'Story'; $lang->my->auditMenu->audit->testcase = 'Case'; if($config->edition == 'max' and strpos(",$config->disabledFeatures,", ',waterfall,') === false) $lang->my->auditMenu->audit->project = 'Project'; if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback'; -if($config->edition != 'open') $lang->my->auditMenu->audit->oa = 'OA'; +if($config->edition != 'open' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $lang->my->auditMenu->audit->oa = 'OA'; $lang->my->contributeMenu = new stdclass(); $lang->my->contributeMenu->audit = new stdclass(); diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index c5c0ed685b..8ed268a36e 100644 --- a/module/my/lang/fr.php +++ b/module/my/lang/fr.php @@ -101,7 +101,7 @@ $lang->my->auditMenu->audit->story = 'Story'; $lang->my->auditMenu->audit->testcase = 'Case'; if($config->edition == 'max' and strpos(",$config->disabledFeatures,", ',waterfall,') === false) $lang->my->auditMenu->audit->project = 'Project'; if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback'; -if($config->edition != 'open') $lang->my->auditMenu->audit->oa = 'OA'; +if($config->edition != 'open' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $lang->my->auditMenu->audit->oa = 'OA'; $lang->my->contributeMenu = new stdclass(); $lang->my->contributeMenu->audit = new stdclass(); diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 86dd0fdb17..fa9d49cc76 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -101,7 +101,7 @@ $lang->my->auditMenu->audit->story = '需求'; $lang->my->auditMenu->audit->testcase = '用例'; if($config->edition == 'max' and strpos(",$config->disabledFeatures,", ',waterfall,') === false) $lang->my->auditMenu->audit->project = '项目'; if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = '反馈'; -if($config->edition != 'open') $lang->my->auditMenu->audit->oa = '办公'; +if($config->edition != 'open' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $lang->my->auditMenu->audit->oa = '办公'; $lang->my->contributeMenu = new stdclass(); $lang->my->contributeMenu->audit = new stdclass(); From a873368635e98bbbb821853bce0b84aeb777838b Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Wed, 2 Nov 2022 06:17:35 +0000 Subject: [PATCH 2/2] * Adjust lang. --- module/admin/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/admin/lang/zh-cn.php b/module/admin/lang/zh-cn.php index 59b4e8272f..449ce0ec6b 100644 --- a/module/admin/lang/zh-cn.php +++ b/module/admin/lang/zh-cn.php @@ -76,7 +76,7 @@ $lang->admin->setModule->product = '产品'; $lang->admin->setModule->scrum = '敏捷项目'; $lang->admin->setModule->waterfall = '瀑布项目'; $lang->admin->setModule->assetlib = '资产库'; -$lang->admin->setModule->other = '其他功能'; +$lang->admin->setModule->other = '通用功能'; $lang->admin->setModule->repo = '代码'; $lang->admin->setModule->issue = '问题';