From 85738fb231389d581f7b0d182d6502ab8ca57dd8 Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Thu, 12 Aug 2021 13:06:57 +0800
Subject: [PATCH] * Finish task#41229.

---
 module/my/control.php              |  8 ++++----
 module/my/lang/zh-cn.php           |  5 ++---
 module/my/view/preference.html.php | 10 ++++------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index d27d9ae06e..9194ec88ec 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1016,10 +1016,10 @@ class my extends control
 
         $this->view->URSRList         = $this->loadModel('custom')->getURSRPairs();
         $this->view->URSR             = $this->setting->getURSR();
-        $this->view->programLink      = isset($this->config->programLink) ? $this->config->programLink : 'program-browse';
-        $this->view->productLink      = isset($this->config->productLink) ? $this->config->productLink : 'product-all';
-        $this->view->projectLink      = isset($this->config->projectLink) ? $this->config->projectLink : 'project-browse';
-        //$this->view->executionLink  = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
+        $this->view->programLink      = isset($this->config->programLink)   ? $this->config->programLink   : 'program-browse';
+        $this->view->productLink      = isset($this->config->productLink)   ? $this->config->productLink   : 'product-all';
+        $this->view->projectLink      = isset($this->config->projectLink)   ? $this->config->projectLink   : 'project-browse';
+        $this->view->executionLink    = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-executionkanban';
         $this->view->preferenceSetted = isset($this->config->preferenceSetted) ? true : false;
 
         $this->display();
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 8105a588b2..04e2e9a325 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -109,9 +109,8 @@ $lang->my->projectLinkList['project-index']     = '默认进入最近一个项
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
-    $lang->my->executionLinkList['execution-task']  = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
-    $lang->my->executionLinkList['execution-index'] = '默认进入执行仪表盘，可以了解所有执行的统计数据和概况';
-    $lang->my->executionLinkList['execution-all']   = '默认进入执行列表，可以查看所有的执行';
+    $lang->my->executionLinkList['execution-task']            = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
+    $lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看所有项目的执行情况';
 }
 if($config->systemMode == 'classic') $lang->my->executionLinkList['execution-task'] = "默认进入最近一个{$lang->executionCommon}的任务列表，可以查看当前{$lang->executionCommon}下的任务信息";
 
diff --git a/module/my/view/preference.html.php b/module/my/view/preference.html.php
index 0db51e2353..e2d0e772b0 100755
--- a/module/my/view/preference.html.php
+++ b/module/my/view/preference.html.php
@@ -57,18 +57,16 @@ html,body {height: 100%;}
         <th><?php echo $lang->my->projectLink;?></th>
         <td><?php echo html::select('projectLink', $lang->my->projectLinkList, $projectLink, "class='form-control chosen'");?></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->my->executionLink;?></th>
+        <td><?php echo html::select('executionLink', $lang->my->executionLinkList, $executionLink, "class='form-control chosen'");?></td>
+      </tr>
       <?php else:?>
       <tr>
         <th><?php echo $lang->my->executionLink;?></th>
         <td><?php echo html::select('executionLink', $lang->my->executionLinkList, 'execution-task', "class='form-control chosen'");?></td>
       </tr>
       <?php endif;?>
-<!--
-      <tr>
-        <th><?php echo $lang->my->executionLink;?></th>
-        <td><?php echo html::select('executionLink', $lang->my->executionLinkList, $executionLink, "class='form-control chosen'");?></td>
-      </tr>
--->
       <tr>
         <td colspan='2' class='text-center form-actions'><?php echo html::submitButton();?></td>
       </tr>