From e99d3664ab6094df89458523fbd1e442d2339bf9 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Mon, 23 Aug 2021 11:37:26 +0800
Subject: [PATCH] * Finish task #41704.

---
 module/group/control.php              | 3 ++-
 module/group/lang/de.php              | 5 ++++-
 module/group/lang/en.php              | 5 ++++-
 module/group/lang/fr.php              | 5 ++++-
 module/group/lang/vi.php              | 6 +++++-
 module/group/lang/zh-cn.php           | 5 ++++-
 module/group/view/manageview.html.php | 2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/module/group/control.php b/module/group/control.php
index 1e849c6c31..68de141498 100644
--- a/module/group/control.php
+++ b/module/group/control.php
@@ -141,7 +141,8 @@ class group extends control
 
         $projects = $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('deleted')->eq('0')
-            ->beginIF($this->config->systemMode != 'classic')->andWhere('type')->eq('project')->fi()
+            ->beginIF($this->config->systemMode == 'classic')->andWhere('type')->in('sprint,stage')->fi()
+            ->beginIF($this->config->systemMode == 'new')->andWhere('type')->eq('project')->fi()
             ->orderBy('order_desc')
             ->fetchPairs('id', 'name');
 
diff --git a/module/group/lang/de.php b/module/group/lang/de.php
index 00c6974c81..11310a9f58 100644
--- a/module/group/lang/de.php
+++ b/module/group/lang/de.php
@@ -34,7 +34,10 @@ $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Leer bedeutet Zugriff verweigert.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->executionCommon}";
+
+global $config;
+if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
+if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Name';
diff --git a/module/group/lang/en.php b/module/group/lang/en.php
index 11212c03e7..042d097e76 100644
--- a/module/group/lang/en.php
+++ b/module/group/lang/en.php
@@ -34,7 +34,10 @@ $lang->group->dynamic            = 'Access Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->executionCommon}";
+
+global $config;
+if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
+if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Group';
diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php
index edc1f8030a..714cda9ba0 100644
--- a/module/group/lang/fr.php
+++ b/module/group/lang/fr.php
@@ -34,7 +34,10 @@ $lang->group->dynamic            = 'Accès Historique';
 $lang->group->noticeVisit        = "Blanc signifie « pas de limitation d'accès ».";
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "No {$lang->productCommon}";
-$lang->group->noneProject        = "No {$lang->executionCommon}";
+
+global $config;
+if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
+if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}";
 
 $lang->group->id       = 'ID';
 $lang->group->name     = 'Groupe';
diff --git a/module/group/lang/vi.php b/module/group/lang/vi.php
index 0f6b989416..aa3da9a7bf 100644
--- a/module/group/lang/vi.php
+++ b/module/group/lang/vi.php
@@ -34,7 +34,11 @@ $lang->group->dynamic            = 'Truy cập Dynamics';
 $lang->group->noticeVisit        = 'Blank means no access limit.';
 $lang->group->noneProgram        = "No Program";
 $lang->group->noneProduct        = "Không có {$lang->productCommon}";
-$lang->group->noneProject        = "Không có {$lang->executionCommon}";
+$lang->group->noneProject        = "No Project";
+
+global $config;
+if($config->systemMode == 'new') $lang->group->noneProject = 'No Project';
+if($config->systemMode == 'classic') $lang->group->noneProject = "No {$lang->executionCommon}";
 
 $lang->group->id      = 'ID';
 $lang->group->name    = 'Nhóm';
diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php
index 32bee9be0e..a4f88bdbed 100644
--- a/module/group/lang/zh-cn.php
+++ b/module/group/lang/zh-cn.php
@@ -34,7 +34,10 @@ $lang->group->dynamic            = '可查看动态';
 $lang->group->noticeVisit        = '空代表没有访问限制';
 $lang->group->noneProgram        = "暂时没有项目集";
 $lang->group->noneProduct        = "暂时没有{$lang->productCommon}";
-$lang->group->noneProject        = "暂时没有{$lang->executionCommon}";
+
+global $config;
+if($config->systemMode == 'new') $lang->group->noneProject = '暂时没有项目';
+if($config->systemMode == 'classic') $lang->group->noneProject = "暂时没有{$lang->executionCommon}";
 
 $lang->group->id       = '编号';
 $lang->group->name     = '分组名称';
diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index b96c86cb1e..459ccecf97 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -82,7 +82,7 @@
             <span class='input-group-addon strong'><?php echo $lang->group->noticeVisit?></span>
           </div>
           <?php else:?>
-          <?php echo $lang->group->noneProgram;?>
+          <?php echo $lang->group->noneProject;?>
           <?php endif;?>
         </td>
       </tr>