From aa0f16c8e8f38d5d07a93249fb7bf328e555cb24 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 26 Aug 2022 16:31:41 +0800 Subject: [PATCH] * Fix bug #26936. --- module/project/control.php | 40 +++++++++++++++++------------------ module/project/lang/de.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/fr.php | 2 +- module/project/lang/zh-cn.php | 2 +- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/module/project/control.php b/module/project/control.php index 887b3d90f4..360896415f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -363,28 +363,26 @@ 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); - $allProjectsNum = $this->loadModel('program')->getProjectStats($programID, 'all'); - $this->view->allProjectsNum = $allProjectsNum; + $this->lang->project->statusList['delay'] = $this->lang->project->delay; - $this->view->title = $this->lang->project->browse; - $this->view->position[] = $this->lang->project->browse; - - $this->view->projectStats = $projectStats; - $this->view->pager = $pager; - $this->view->programID = $programID; - $this->view->program = $this->program->getByID($programID); - $this->view->programTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); - $this->view->programs = array('0' => '') + $this->program->getParentPairs(); - $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); - $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid'); - $this->view->usersAvatar = $this->user->getAvatarPairs(); - $this->view->browseType = $browseType; - $this->view->projectType = $projectType; - $this->view->param = $param; - $this->view->orderBy = $orderBy; - $this->view->recTotal = $recTotal; - $this->view->recPerPage = $recPerPage; - $this->view->pageID = $pageID; + $this->view->title = $this->lang->project->browse; + $this->view->projectStats = $projectStats; + $this->view->pager = $pager; + $this->view->programID = $programID; + $this->view->program = $this->program->getByID($programID); + $this->view->programTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); + $this->view->programs = array('0' => '') + $this->program->getParentPairs(); + $this->view->users = $this->loadModel('user')->getPairs('noletter|pofirst|nodeleted'); + $this->view->userIdPairs = $this->loadModel('user')->getPairs('nodeleted|showid'); + $this->view->usersAvatar = $this->user->getAvatarPairs(); + $this->view->browseType = $browseType; + $this->view->projectType = $projectType; + $this->view->param = $param; + $this->view->orderBy = $orderBy; + $this->view->recTotal = $recTotal; + $this->view->recPerPage = $recPerPage; + $this->view->pageID = $pageID; + $this->view->allProjectsNum = $this->loadModel('program')->getProjectStats($programID, 'all'); $this->display(); } diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 17b7fd1bc2..40ec403deb 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -64,6 +64,7 @@ $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'; @@ -278,7 +279,6 @@ $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'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 3a1a43017d..b36a010a97 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -64,6 +64,7 @@ $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'; @@ -278,7 +279,6 @@ $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'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 172369bcb4..cb99d0b65a 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -64,6 +64,7 @@ $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'; @@ -278,7 +279,6 @@ $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'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index c86c8f00ea..d2d5da0dc5 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -64,6 +64,7 @@ $lang->project->budgetNumber = '『预算』金额必须为数字。'; $lang->project->budgetGe0 = '『预算』金额必须大于等于0。'; $lang->project->allProjects = '所有项目'; $lang->project->ignore = '忽略'; +$lang->project->delay = '已延期'; /* Fields. */ $lang->project->common = '项目'; @@ -278,7 +279,6 @@ $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] = '三个月';