From 593fcc2db63491ada1ac39986285cd75cfad2286 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Tue, 29 Mar 2022 17:12:54 +0800
Subject: [PATCH] * fix bug gantt

---
 extension/lite/execution/ext/lang/en/lite.php    |  3 +--
 extension/lite/execution/ext/lang/zh-cn/lite.php |  2 +-
 .../lite/project/ext/view/execution.html.php     | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/extension/lite/execution/ext/lang/en/lite.php b/extension/lite/execution/ext/lang/en/lite.php
index 77fd87e1bf..89dcb59beb 100644
--- a/extension/lite/execution/ext/lang/en/lite.php
+++ b/extension/lite/execution/ext/lang/en/lite.php
@@ -23,5 +23,4 @@ $lang->execution->icons['grouptask'] = 'sitemap';
 
 $lang->execution->aclList['private'] = "Private (Accessible to team members and project leaders)";
 
-$lang->execution->common = 'Project Execution';
-$lang->execution->gantt  = 'Gantt Chart';
\ No newline at end of file
+$lang->execution->common = 'Project Execution';
\ No newline at end of file
diff --git a/extension/lite/execution/ext/lang/zh-cn/lite.php b/extension/lite/execution/ext/lang/zh-cn/lite.php
index 268f3efa1b..91943c1558 100644
--- a/extension/lite/execution/ext/lang/zh-cn/lite.php
+++ b/extension/lite/execution/ext/lang/zh-cn/lite.php
@@ -24,4 +24,4 @@ $lang->execution->icons['grouptask'] = 'sitemap';
 
 $lang->execution->aclList['private'] = "私有（团队成员和项目负责人可访问）";
 
-$lang->execution->common = '项目看板';
+$lang->execution->common = '项目看板';
\ No newline at end of file
diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php
index 3040070ec9..fb4d7f1a9e 100644
--- a/extension/lite/project/ext/view/execution.html.php
+++ b/extension/lite/project/ext/view/execution.html.php
@@ -37,8 +37,22 @@
   </div>
   <?php else:?>
     <div class='kanban-cards'>
+      <?php 
+        $kanbanview = 'kanban';
+        if($this->cookie->kanbanview)
+        {
+            $kanbanview = $this->cookie->kanbanview;
+        }
+        else
+        {
+            foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view) 
+            {
+                if(common::hasPriv('execution', $view)) $kanbanview = 'kanban';
+            }
+        }
+      ?>
       <?php foreach($kanbanList as $index => $kanban):?>
-        <div id="kanban-<?php echo $kanban->id;?>" class='kanban-card col' data-url='<?php echo $this->createLink('execution', $this->cookie->kanbanview ? $this->cookie->kanbanview : 'kanban', "kanbanID=$kanban->id");?>'>
+        <div id="kanban-<?php echo $kanban->id;?>" class='kanban-card col' data-url='<?php echo $this->createLink('execution', $kanbanview, "kanbanID=$kanban->id");?>'>
           <div class="panel">
             <div class="panel-heading">
               <span class="label kanban-status-<?php echo $kanban->status;?>"><?php echo zget($lang->execution->statusList, $kanban->status);?></span>