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

Merge branch 'sprint/235_tianshujie_26936' into 'master'

Browse Source 
* Fix bug #26936.

See merge request easycorp/zentaopms!5168
This commit is contained in:
孙广明
2022-08-29 02:25:42 +00:00
parent c2752a14ac 915baa54b5
commit 9722d6afd0
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
-2
View File
@@ -363,8 +363,6 @@ class project extends control
$programTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle');
$projectStats = $this->loadModel('program')->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager, $programTitle);
$this->lang->project->statusList['delay'] = $this->lang->project->delay;
$this->view->title = $this->lang->project->browse;
$this->view->projectStats = $projectStats;
$this->view->pager = $pager;
module/project/lang/de.php
+1 -1
View File
@@ -64,7 +64,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.';
$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
$lang->project->allProjects = 'All Projects';
$lang->project->ignore = 'Ignore';
$lang->project->delay = 'Delayed';
/* Fields. */
$lang->project->common = 'Project';
@@ -279,6 +278,7 @@ $lang->project->statusList['wait'] = 'Waiting';
$lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspended';
$lang->project->statusList['closed'] = 'Closed';
$lang->project->statusList['delay'] = 'Delayed';
$lang->project->endList[31] = 'One month';
$lang->project->endList[93] = 'Trimester';
module/project/lang/en.php
+1 -1
View File
@@ -64,7 +64,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.';
$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
$lang->project->allProjects = 'All Projects';
$lang->project->ignore = 'Ignore';
$lang->project->delay = 'Delayed';
/* Fields. */
$lang->project->common = 'Project';
@@ -279,6 +278,7 @@ $lang->project->statusList['wait'] = 'Waiting';
$lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspended';
$lang->project->statusList['closed'] = 'Closed';
$lang->project->statusList['delay'] = 'Delayed';
$lang->project->endList[31] = 'One month';
$lang->project->endList[93] = 'Trimester';
module/project/lang/fr.php
+1 -1
View File
@@ -64,7 +64,6 @@ $lang->project->budgetNumber = '『Budget』must be numbers.';
$lang->project->budgetGe0 = '『Budget』must be greater than or equal to 0.';
$lang->project->allProjects = 'All Projects';
$lang->project->ignore = 'Ignorer';
$lang->project->delay = 'Delayed';
/* Fields. */
$lang->project->common = 'Projets';
@@ -279,6 +278,7 @@ $lang->project->statusList['wait'] = 'Waiting';
$lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspended';
$lang->project->statusList['closed'] = 'Closed';
$lang->project->statusList['delay'] = 'Delayed';
$lang->project->endList[31] = 'One month';
$lang->project->endList[93] = 'Trimester';
module/project/lang/zh-cn.php
+1 -1
View File
@@ -64,7 +64,6 @@ $lang->project->budgetNumber = '『预算』金额必须为数字。';
$lang->project->budgetGe0 = '『预算』金额必须大于等于0。';
$lang->project->allProjects = '所有项目';
$lang->project->ignore = '忽略';
$lang->project->delay = '已延期';
/* Fields. */
$lang->project->common = '项目';
@@ -279,6 +278,7 @@ $lang->project->statusList['wait'] = '未开始';
$lang->project->statusList['doing'] = '进行中';
$lang->project->statusList['suspended'] = '已挂起';
$lang->project->statusList['closed'] = '已关闭';
$lang->project->statusList['delay'] = '已延期';
$lang->project->endList[31] = '一个月';
$lang->project->endList[93] = '三个月';
module/project/model.php
+4
View File
@@ -875,6 +875,10 @@ class projectModel extends model
$this->config->project->search['queryID'] = $queryID;
$this->config->project->search['actionURL'] = $actionURL;
$statusList = $this->lang->project->statusList;
unset($statusList['delay']);
$this->config->project->search['params']['status']['values'] = $statusList;
$programPairs = array(0 => '');
$programPairs += $this->loadModel('program')->getPairs();
$this->config->project->search['params']['parent']['values'] = $programPairs;