From ccc8c97aaa31fb3ada2dc10fa868eea226f15f47 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Thu, 8 Jul 2021 10:14:23 +0800
Subject: [PATCH] * Finish task#40008.

---
 module/common/lang/menu.php  |  5 +++--
 module/common/lang/zh-cn.php |  2 +-
 module/common/model.php      |  4 ++--
 module/execution/control.php | 11 +++++++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 2e2107aefa..1cdbc98c1e 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -225,8 +225,9 @@ $lang->scrum->menu->settings['subMenu']->group       = array('link' => "{$lang->
 
 /* Execution menu. */
 $lang->execution->homeMenu = new stdclass();
-if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
-$lang->execution->homeMenu->list  = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
+//if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|";
+//$lang->execution->homeMenu->list = array('link' => "{$lang->execution->list}|execution|all|", 'alias' => 'create,batchedit');
+$lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|");
 
 $lang->execution->menu = new stdclass();
 $lang->execution->menu->task     = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 911531ff6a..c6d539fc1f 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -209,7 +209,7 @@ $lang->my->work = '待处理';
 
 $lang->project->list = '项目列表';
 
-$lang->execution->list = "{$lang->executionCommon}列表";
+$lang->execution->executionKanban = "{$lang->execution->common}看板";
 
 $lang->doc->recent    = '最近文档';
 $lang->doc->my        = '我的文档';
diff --git a/module/common/model.php b/module/common/model.php
index 812c1007cd..f7890da9ca 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -543,7 +543,7 @@ class commonModel extends model
         {
             $nav = $lang->mainNav->$openApp;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
-            if($openApp == 'execution') $currentMethod = 'all';
+            if($openApp == 'execution') $currentMethod = 'executionKanban';
         }
         else
         {
@@ -553,7 +553,7 @@ class commonModel extends model
         }
 
         if($config->systemMode == 'classic' and $openApp == 'execution') $icon = zget($lang->navIcons, 'project', '');
-        $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : '';
+        $link = helper::createLink($currentModule, $currentMethod);
         $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}";
 
         echo "<div class='btn-group header-btn'>" . $html . '</div>';
diff --git a/module/execution/control.php b/module/execution/control.php
index f31cb305a6..f51727a1cc 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1861,6 +1861,17 @@ class execution extends control
         $this->display();
     }
 
+    /**
+     * Execution kanban.
+     *
+     * @access public
+     * @return void
+     */
+    public function executionKanban()
+    {
+        $this->display();
+    }
+
     /**
      * Tree view.
      * Product