Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'zentaopms_239_task#73845' into 'zentaopms_239'

Browse Source 
* Finish task #73845 ~ #73848.

See merge request easycorp/zentaopms!5984
This commit is contained in:
王怡栋
2022-11-02 06:24:45 +00:00
parent 5010149390 a873368635
commit 16f8d7450b
9 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/config.php
+1 -1
View File
@@ -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';
module/admin/control.php
+1 -1
View File
@@ -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&section=&key=closedFeatures');
module/admin/lang/zh-cn.php
+1 -1
View File
@@ -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 = '问题';
module/common/lang/menu.php
+15 -2
View File
@@ -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)
module/group/lang/resource.php
+5
View File
@@ -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');
module/my/lang/de.php
+1 -1
View File
@@ -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();
module/my/lang/en.php
+1 -1
View File
@@ -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();
module/my/lang/fr.php
+1 -1
View File
@@ -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();
module/my/lang/zh-cn.php
+1 -1
View File
@@ -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();