From 3f63404953650aa7f79d80bb05dc1b2845cf5d4e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 6 Mar 2023 06:09:13 +0000
Subject: [PATCH] * Finish task #86258.

---
 module/common/lang/de.php       | 1 +
 module/common/lang/en.php       | 1 +
 module/common/lang/fr.php       | 1 +
 module/common/lang/menu.php     | 6 ++++--
 module/common/lang/zh-cn.php    | 1 +
 module/execution/lang/de.php    | 1 -
 module/execution/lang/en.php    | 1 -
 module/execution/lang/fr.php    | 1 -
 module/execution/lang/zh-cn.php | 1 -
 module/project/config.php       | 2 +-
 module/project/model.php        | 2 +-
 11 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 8c4350fb04..1908d37e7e 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -209,6 +209,7 @@ $lang->stage->type        = 'Stage Type';
 $lang->stage->list        = 'Stage List';
 $lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
+$lang->execution->CFD     = "Cumulative Flow Diagrams";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 296662eff4..9ea5255c9b 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -209,6 +209,7 @@ $lang->stage->type        = 'Stage Type';
 $lang->stage->list        = 'Stage List';
 $lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
+$lang->execution->CFD     = "Cumulative Flow Diagrams";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 03d20b96d7..d85242c5c6 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -209,6 +209,7 @@ $lang->stage->type        = 'Stage Type';
 $lang->stage->list        = 'Stage List';
 $lang->stage->percent     = 'Workload Ratio';
 $lang->execution->list    = "{$lang->executionCommon} List";
+$lang->execution->CFD     = "Cumulative Flow Diagrams";
 $lang->kanban->common     = 'Kanban';
 $lang->backup->common     = 'Backup';
 $lang->action->trash      = 'Recycle';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 35a2ae034c..c9904f160c 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -418,6 +418,7 @@ $lang->project->noMultiple->scrum->menu->settings   = $lang->scrum->menu->settin
 $lang->project->noMultiple->kanban                 = new stdclass();
 $lang->project->noMultiple->kanban->menu           = new stdclass();
 $lang->project->noMultiple->kanban->menu->kanban   = array('link' => "{$lang->kanban->common}|execution|kanban|executionID=%s");
+$lang->project->noMultiple->kanban->menu->CFD      = array('link' => "{$lang->execution->CFD}|execution|cfd|executionID=%s");
 $lang->project->noMultiple->kanban->menu->build    = $lang->kanbanProject->menu->build;
 $lang->project->noMultiple->kanban->menu->settings = $lang->kanbanProject->menu->settings;
 
@@ -438,8 +439,9 @@ $lang->project->noMultiple->scrum->menuOrder[50] = 'dynamic';
 $lang->project->noMultiple->scrum->menuOrder[55] = 'settings';
 
 $lang->project->noMultiple->kanban->menuOrder[5]  = 'kanban';
-$lang->project->noMultiple->kanban->menuOrder[10] = 'build';
-$lang->project->noMultiple->kanban->menuOrder[15] = 'settings';
+$lang->project->noMultiple->kanban->menuOrder[10] = 'CFD';
+$lang->project->noMultiple->kanban->menuOrder[15] = 'build';
+$lang->project->noMultiple->kanban->menuOrder[20] = 'settings';
 
 /* QA menu.*/
 $lang->qa->menu = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 35824d6254..6e5df849d5 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -209,6 +209,7 @@ $lang->stage->type        = '阶段类型';
 $lang->stage->list        = '阶段列表';
 $lang->stage->percent     = '工作量占比';
 $lang->execution->list    = "{$lang->executionCommon}列表";
+$lang->execution->CFD     = "累积流图";
 $lang->kanban->common     = '看板';
 $lang->backup->common     = '备份';
 $lang->action->trash      = '回收站';
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 993b5092e6..b8858ca746 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -227,7 +227,6 @@ $lang->execution->build                     = 'Builds';
 $lang->execution->testtask                  = 'Testaufgaben';
 $lang->execution->burn                      = 'Burndown';
 $lang->execution->computeBurn               = 'Aktualisieren';
-$lang->execution->CFD                       = 'Cumulative Flow diagrams';
 $lang->execution->computeCFD                = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData                  = 'Burndown Daten';
 $lang->execution->fixFirst                  = 'Bearbeite Mannstunden des ersten Tags';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 4a54020911..78b9afe79a 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -227,7 +227,6 @@ $lang->execution->build                     = 'Build List';
 $lang->execution->testtask                  = 'Request';
 $lang->execution->burn                      = 'Burndown';
 $lang->execution->computeBurn               = 'Update';
-$lang->execution->CFD                       = 'Cumulative Flow diagrams';
 $lang->execution->computeCFD                = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData                  = 'Burndown Data';
 $lang->execution->fixFirst                  = 'Edit 1st-Day Estimates';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index edb6d956ed..968f605828 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -227,7 +227,6 @@ $lang->execution->build                     = 'Build List';
 $lang->execution->testtask                  = 'Request';
 $lang->execution->burn                      = 'Burndown';
 $lang->execution->computeBurn               = 'Update';
-$lang->execution->CFD                       = 'Cumulative Flow diagrams';
 $lang->execution->computeCFD                = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData                  = 'Burndown Data';
 $lang->execution->fixFirst                  = 'Edit 1st-Day Estimates';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ed2fcaab23..8fae721ad2 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -227,7 +227,6 @@ $lang->execution->build                     = '所有版本';
 $lang->execution->testtask                  = '测试单';
 $lang->execution->burn                      = '燃尽图';
 $lang->execution->computeBurn               = '更新燃尽图';
-$lang->execution->CFD                       = '累积流图';
 $lang->execution->computeCFD                = '更新累积流图';
 $lang->execution->burnData                  = '燃尽图数据';
 $lang->execution->fixFirst                  = '修改首天工时';
diff --git a/module/project/config.php b/module/project/config.php
index bb8ff5e92d..d8222aed4f 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -33,7 +33,7 @@ $config->project->sortFields->status = 'status';
 $config->project->sortFields->budget = 'budget';
 
 $config->project->multiple['project']   = ',qa,devops,doc,build,release,dynamic,settings,';
-$config->project->multiple['execution'] = ',task,kanban,burn,view,story,';
+$config->project->multiple['execution'] = ',task,kanban,burn,view,story,CFD,';
 
 global $lang;
 $config->project->datatable = new stdclass();
diff --git a/module/project/model.php b/module/project/model.php
index ce5b643326..790b51238d 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2899,7 +2899,7 @@ class projectModel extends model
             $executionID = $this->dao->select('id')->from(TABLE_EXECUTION)
                 ->where('project')->eq($projectID)
                 ->andWhere('multiple')->eq('0')
-                ->andWhere('type')->eq('sprint')
+                ->andWhere('type')->in('kanban,sprint')
                 ->andWhere('deleted')->eq('0')
                 ->fetch('id');
         }