From 5bedd02491de2fb5019940a93bca911577e8331f Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 11 Jul 2022 09:54:58 +0800
Subject: [PATCH] * Fix bug #25031.

---
 module/execution/js/cfd.js                     | 14 ++++++++++++--
 module/execution/model.php                     |  4 ++++
 module/execution/view/ajaxgetdropmenu.html.php |  3 +--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/module/execution/js/cfd.js b/module/execution/js/cfd.js
index 8ccc23f65c..43023e2a1c 100644
--- a/module/execution/js/cfd.js
+++ b/module/execution/js/cfd.js
@@ -48,6 +48,16 @@ $(function()
                 backgroundColor: '#6a7985'
               }
             },
+            formatter: function (params) {
+              var newParams = [];
+              var tooltipString = [];
+              newParams = params.reverse();
+              newParams.forEach((p) => {
+                const cont = p.marker + ' ' + p.seriesName + ': ' + p.value + '<br/>';
+                tooltipString.push(cont);
+              });
+              return tooltipString.join('');
+            },
             textStyle: {
               fontWeight: 100
             }
@@ -57,7 +67,7 @@ $(function()
           },
           grid: {
             left: '3%',
-            right: '4%',
+            right: '5%',
             bottom: '3%',
             containLabel: true
           },
@@ -99,7 +109,7 @@ $(function()
                 show: true,
                 lineStyle:
                 {
-                  color: ['#999'],
+                  color: '#999',
                   width: 1
                 }
               }
diff --git a/module/execution/model.php b/module/execution/model.php
index 73155aa563..b9d90cbfa3 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1516,6 +1516,10 @@ class executionModel extends model
         {
             $link = helper::createLink($module, 'task', "executionID=%s");
         }
+        elseif($module == 'execution' and $method == 'cfd')
+        {
+            $link = helper::createLink('execution', 'kanban', "executionID=%s");
+        }
         elseif($module == 'bug' and $method == 'create' and $this->app->tab == 'execution')
         {
             $link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s");
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 538ad37053..45c6013935 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -76,9 +76,8 @@ foreach($executions as $projectID => $projectExecutions)
     foreach($projectExecutions as $index => $execution)
     {
         $kanbanLink = $this->createLink('execution', 'kanban', "executionID=%s");
-        $cfdLink    = $this->createLink('execution', 'cfd', "executionID=%s");
         $taskLink   = $this->createLink('execution', 'task', "executionID=%s");
-        if($execution->type != 'kanban' and ($link == $kanbanLink or $link == $cfdLink)) $link = $taskLink;
+        if($execution->type != 'kanban' and $link == $kanbanLink) $link = $taskLink;
         if($execution->type == 'kanban' and $link != $kanbanLink) $link = $kanbanLink;
 
         $selected = $execution->id == $executionID ? 'selected' : '';