From 915baa54b5a40dfd88633c70bacf6b59d42c1303 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Mon, 29 Aug 2022 10:09:10 +0800
Subject: [PATCH] * Fix bug #26936.

---
 module/project/control.php    | 2 --
 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 +-
 module/project/model.php      | 4 ++++
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 360896415f..825c277453 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -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;
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 40ec403deb..17b7fd1bc2 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -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';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index b36a010a97..3a1a43017d 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -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';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index cb99d0b65a..172369bcb4 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -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';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index d2d5da0dc5..c86c8f00ea 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -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]  = '三个月';
diff --git a/module/project/model.php b/module/project/model.php
index f1df79b9c8..0c54d66c37 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -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;