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

Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'

Browse Source 
* Adjust otherOa to otherOA.

See merge request easycorp/zentaopms!6022
This commit is contained in:
王 于听
2022-11-03 07:58:16 +00:00
parent 0a22ed089c b4f6b346b8
commit 6bf7edef75
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/control.php
+1
View File
@@ -254,6 +254,7 @@ class admin extends control
}
$closedFeatures = rtrim($closedFeatures, ',');
$this->loadModel('setting')->setItem('system.common.closedFeatures', $closedFeatures);
$this->loadModel('custom')->processMeasrecordCron();
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'top'));
}
$this->view->title = $this->lang->admin->setModuleIndex;
module/admin/lang/zh-cn.php
+1 -1
View File
@@ -100,7 +100,7 @@ $lang->admin->setModule->practicelib = '最佳实践库';
$lang->admin->setModule->componentlib = '组件库';
$lang->admin->setModule->devops = 'DevOps';
$lang->admin->setModule->kanban = '通用看板';
$lang->admin->setModule->oa = '办公';
$lang->admin->setModule->OA = '办公';
$lang->admin->setModule->deploy = '运维';
$lang->admin->setModule->traincourse = '学堂';
module/custom/model.php
+11 -7
View File
@@ -907,7 +907,7 @@ class customModel extends model
$disabledFeatures = rtrim($disabledFeatures, ',');
$this->loadModel('setting')->setItem('system.common.disabledFeatures', $disabledFeatures);
$this->processMeasrecordCron($disabledFeatures);
$this->processMeasrecordCron();
}
/**
@@ -1057,17 +1057,21 @@ class customModel extends model
/**
* Process measrecord cron.
*
* @param string $disabledFeatures
* @access public
* @return void
*/
public function processMeasrecordCron($disabledFeatures)
public function processMeasrecordCron()
{
$cronStatus = 'normal';
$this->loadModel('setting');
$closedFeatures = $this->setting->getItem('owner=system&module=common&section=&key=closedFeatures');
$disabledFeatures = $this->setting->getItem('owner=system&module=common&section=&key=disabledFeatures');
$disabledFeatures = $disabledFeatures . ',' . $closedFeatures;
$hasWaterfall = strpos(",{$this->config->disabledFeatures},", ',waterfall,') === false;
$hasScrumMeasrecord = strpos(",{$this->config->disabledFeatures},", ',scrumMeasrecord,') === false;
$hasWaterfallMeasrecord = (strpos(",{$this->config->disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall);
$hasWaterfall = strpos(",{$disabledFeatures},", ',waterfall,') === false;
$hasScrumMeasrecord = strpos(",{$disabledFeatures},", ',scrumMeasrecord,') === false;
$hasWaterfallMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall);
$cronStatus = 'normal';
if(!$hasScrumMeasrecord and !$hasWaterfallMeasrecord) $cronStatus = 'stop';
$this->loadModel('cron');
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' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $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' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $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' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $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' and strpos(",$config->disabledFeatures,", ',otherOa,') === false) $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();