From 66f26a72e8345afa7548b2eed4a311f0d3619dad Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Fri, 1 Jul 2022 01:32:11 +0000
Subject: [PATCH 01/40] fixbug_24248

---
 module/execution/view/view.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 108e4a756b..719f49369c 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -121,11 +121,11 @@
                 <?php $i = 0;?>
                 <?php foreach($docLibs as $libID => $docLib):?>
                 <?php if($i > 8) break;?>
-                <div class="col-xs-6">
+                <div class="col-xs-6 text-ellipsis">
                   <?php if($libID == 'files'):?>
                   <?php echo html::a($this->createLink('doc', 'showFiles', "type=execution&objectID=$execution->id"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name);?>
                   <?php else:?>
-                  <?php echo html::a($this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}&libID=$libID"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name, '', "data-app='execution'");?>
+                  <?php echo html::a($this->createLink('doc', 'objectLibs', "type=execution&objectID={$execution->id}&libID=$libID"), "<i class='icon icon-folder text-yellow'></i> " . $docLib->name, '', "data-app='execution' title='$docLib->name'");?>
                   <?php endif;?>
                 </div>
                 <?php $i++;?>

From 28c6608986690849d541c9e75edba7dbc17c9e25 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 7 Jul 2022 02:59:57 +0000
Subject: [PATCH 02/40] * Finish task #59681.

---
 module/kanban/control.php |   3 +-
 module/task/control.php   | 218 ++++++++++++++++++++++++++------------
 2 files changed, 154 insertions(+), 67 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 751a76400b..6b2a0a43cd 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1482,7 +1482,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function deleteObjectCard($objectType, $objectID, $regionID)
+    public function deleteObjectCard($objectType, $objectID, $regionID, $from = '')
     {
         if(!($objectType == 'task' or $objectType == 'story' or $objectType == 'bug')) return false;
         $table = 'TABLE_' . strtoupper($objectType);
@@ -1493,6 +1493,7 @@ class kanban extends control
         $browseType  = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType;
         $groupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
         $kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy);
+        if($from == 'taskkanban') $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($kanbanID, $browseType, $groupBy);
 
         return print(json_encode($kanbanGroup));
     }
diff --git a/module/task/control.php b/module/task/control.php
index 104163f453..1196b79a3e 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -180,16 +180,23 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution' or $this->config->vision == 'lite'))
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
@@ -355,16 +362,23 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::reload('parent.parent'));
@@ -515,15 +529,24 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::reload('parent.parent'));
@@ -741,16 +764,23 @@ class task extends control
             if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'success'));
             if(isonlybody())
             {
-                $task      = $this->task->getById($taskID);
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $task          = $this->task->getById($taskID);
+                $execution     = $this->execution->getByID($task->execution);
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));
@@ -991,18 +1021,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
@@ -1056,17 +1093,24 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution = $this->execution->getByID($task->execution);
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));
@@ -1194,18 +1238,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
                     $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
@@ -1284,19 +1335,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task      = $this->task->getById($taskID);
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $task          = $this->task->getById($taskID);
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
                     $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));
@@ -1343,18 +1401,25 @@ class task extends control
 
             if(isonlybody())
             {
-                $task      = $this->task->getById($taskID);
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $task          = $this->task->getById($taskID);
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));
@@ -1419,17 +1484,24 @@ class task extends control
                     }
                 }
 
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
                     $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
@@ -1583,19 +1655,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task      = $this->task->getById($taskID);
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $task          = $this->task->getById($taskID);
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
                     $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));
@@ -1642,19 +1721,26 @@ class task extends control
 
             if(isonlybody())
             {
-                $task      = $this->task->getById($taskID);
-                $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                $task          = $this->task->getById($taskID);
+                $execution     = $this->execution->getByID($task->execution);
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
                 {
                     $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
+                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData['task']);
+
+                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                }
                 else
                 {
                     return print(js::closeModal('parent.parent', 'this'));

From 63128f625868473bc6a3d67772316836acec1a34 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 7 Jul 2022 05:36:28 +0000
Subject: [PATCH 03/40] * Finish task #59681.

---
 module/task/control.php | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/module/task/control.php b/module/task/control.php
index 1196b79a3e..0216a92236 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -193,7 +193,9 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
+                    $kanbanData = json_encode($kanbanData);
 
                     return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -375,6 +377,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -543,6 +547,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -777,6 +783,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1036,6 +1044,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1107,6 +1117,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1253,6 +1265,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1351,6 +1365,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1416,6 +1432,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1498,6 +1516,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1671,6 +1691,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
@@ -1737,6 +1759,8 @@ class task extends control
                 elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
                 {
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
                     $kanbanData = json_encode($kanbanData['task']);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));

From f1e7a1350d11d826b40a7cc5f636ecf1f7a345ed Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 7 Jul 2022 05:40:39 +0000
Subject: [PATCH 04/40] * Fix bug#24812.

---
 module/file/view/printfiles.html.php | 2 ++
 module/file/view/viewfiles.html.php  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index e66cbc43c8..b82e3022f7 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -7,6 +7,8 @@
   <style>
   .files-list>li>a {display: inline; word-wrap: break-word;}
   .files-list>li>.right-icon {opacity: 1;}
+  .files-list>li>.right-icon>a {padding-left: 7px;}
+  html[lang|="zh"] .files-list>li>.right-icon>a {padding-left: 3px;}
   </style>
   <script>
   /* Delete a file. */
diff --git a/module/file/view/viewfiles.html.php b/module/file/view/viewfiles.html.php
index cafd4f0a93..1a073eb3b3 100644
--- a/module/file/view/viewfiles.html.php
+++ b/module/file/view/viewfiles.html.php
@@ -8,6 +8,8 @@
   <style>
   .files-list>li>a {display: inline; word-wrap: break-word;}
   .files-list>li>.right-icon {opacity: 1;}
+  .files-list>li>.right-icon>a {padding-left: 7px;}
+  html[lang|="zh"] .files-list>li>.right-icon>a {padding-left: 3px;}
   </style>
   <script>
   /* Delete a file. */

From 207e5bece6404a434740c0ac9f8fab3903b88fc4 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 7 Jul 2022 05:43:12 +0000
Subject: [PATCH 05/40] * Fix bug#24825.

---
 module/projectrelease/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php
index 021a0b0cd5..84426ac700 100644
--- a/module/projectrelease/view/create.html.php
+++ b/module/projectrelease/view/create.html.php
@@ -25,7 +25,7 @@
           <tr>
             <th><?php echo $lang->release->name;?></th>
             <td><?php echo html::input('name', '', "class='form-control' required");?></td>
-            <td class='muted'>
+            <td>
               <div id='markerBox' class='checkbox-primary'>
                 <input id='marker' name='marker' value='1' type='checkbox' />
                 <label for='marker'><?php echo $lang->release->marker;?></label>

From e68d80548621d025fcde81631e5ec2fa87455f49 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 7 Jul 2022 07:49:17 +0000
Subject: [PATCH 06/40] * Finish task #59681.

---
 module/task/control.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 0216a92236..2eff1674c9 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -379,7 +379,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -549,7 +549,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -785,7 +785,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1046,7 +1046,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1119,7 +1119,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1267,7 +1267,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1367,7 +1367,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1434,7 +1434,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1518,7 +1518,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1693,7 +1693,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
@@ -1761,7 +1761,7 @@ class task extends control
                     $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
                     $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
                     $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData['task']);
+                    $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }

From 2f812698581edef0b08f284f8bbd16c6274d4093 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 16:13:55 +0800
Subject: [PATCH 07/40] * Code for task#59543.

---
 module/bug/control.php | 76 +++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 506e470b9a..5806d9f831 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -997,13 +997,26 @@ class bug extends control
             if(isonlybody())
             {
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution')
                 {
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    if(isset($execution->type) and $execution->type == 'kanban')
+                    {
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1621,16 +1634,27 @@ class bug extends control
             if(isonlybody())
             {
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    if(isset($execution->type) and $execution->type == 'kanban')
+                    {
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1716,16 +1740,27 @@ class bug extends control
             parse_str($extra, $output);
             if(isonlybody())
             {
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    if(isset($execution->type) and $execution->type == 'kanban')
+                    {
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -2086,7 +2121,18 @@ class bug extends control
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
 
             if(isonlybody()) return print(js::reload('parent.parent'));
-            if($from == 'taskkanban') return print(js::reload('parent'));
+
+            if($from == 'taskkanban')
+            {
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                $kanbanType    = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                $kanbanData    = $kanbanData[$kanbanType];
+                $kanbanData    = json_encode($kanbanData);
+                return print(js::closeModal('parent', '', "parent.updateKanban(\"bug\", $kanbanData)"));
+            }
 
             $locateLink = $this->session->bugList ? $this->session->bugList : inlink('browse', "productID={$bug->product}");
             return print(js::locate($locateLink, 'parent'));

From 030a3ea89fe58499fb4c1687099899d961fa4dd8 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 7 Jul 2022 08:27:31 +0000
Subject: [PATCH 08/40] * Fix bug#24761

---
 module/doc/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 52a5c4c5f1..2d09c38b85 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -589,7 +589,8 @@ class doc extends control
 
                     if($from == 'lib')
                     {
-                        $response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID=0&libID={$doc->lib}");
+                        $objectID = $objectType == 'project' ? $doc->project : $doc->product;
+                        $response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType&objectID={$objectID}&libID={$doc->lib}");
                     }
                 }
                 return $this->send($response);

From 2e733795f6ff59a877647a47510a0c0780c49c5e Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 16:49:24 +0800
Subject: [PATCH 09/40] * Code for task#59543. Update bug to story.

---
 module/story/control.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/module/story/control.php b/module/story/control.php
index ad97952255..a4ff8cd4c4 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -193,15 +193,27 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
 
-                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
+
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {

From 18c28227bb3b1a7e30babba9d61e32a84337dad8 Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Thu, 7 Jul 2022 09:00:25 +0000
Subject: [PATCH 10/40]  * Finish task #59432.

---
 lib/scm/subversion.class.php | 136 +++++++++++++++++------------------
 module/repo/control.php      |  11 ++-
 2 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/lib/scm/subversion.class.php b/lib/scm/subversion.class.php
index 31ba586ca7..1bddd6baa1 100644
--- a/lib/scm/subversion.class.php
+++ b/lib/scm/subversion.class.php
@@ -11,13 +11,13 @@ class Subversion
     public $svnVersion;
 
     /**
-     * Construct 
-     * 
-     * @param  string $client 
-     * @param  string $root 
-     * @param  string $account 
-     * @param  string $password 
-     * @param  string $encoding 
+     * Construct
+     *
+     * @param  string $client
+     * @param  string $root
+     * @param  string $account
+     * @param  string $password
+     * @param  string $encoding
      * @access public
      * @return void
      */
@@ -37,10 +37,10 @@ class Subversion
     }
 
     /**
-     * List files. 
-     * 
-     * @param  string $path 
-     * @param  string $revision 
+     * List files.
+     *
+     * @param  string $path
+     * @param  string $revision
      * @access public
      * @return array
      */
@@ -91,10 +91,10 @@ class Subversion
 
     /**
      * Get tags.
-     * 
-     * @param  string $path 
-     * @param  string $revision 
-     * @param  bool   $onlyDir 
+     *
+     * @param  string $path
+     * @param  string $revision
+     * @param  bool   $onlyDir
      * @access public
      * @return array
      */
@@ -129,7 +129,7 @@ class Subversion
 
     /**
      * Get branch.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -140,9 +140,9 @@ class Subversion
 
     /**
      * Get last log.
-     * 
-     * @param  string $path 
-     * @param  int    $count 
+     *
+     * @param  string $path
+     * @param  int    $count
      * @access public
      * @return array
      */
@@ -170,8 +170,8 @@ class Subversion
         foreach($parsedComments->logentry as $entry)
         {
             $log = new stdclass();
-            $log->committer = (string)$entry->author; 
-            $log->revision  = (int)$entry['revision']; 
+            $log->committer = (string)$entry->author;
+            $log->revision  = (int)$entry['revision'];
             $log->comment   = trim((string)$entry->msg);
             $log->time      = date('Y-m-d H:i:s', strtotime($entry->date));
             $log->change    = array();
@@ -188,12 +188,12 @@ class Subversion
 
     /**
      * Get log.
-     * 
-     * @param  string $path 
-     * @param  int    $fromRevision 
-     * @param  string $toRevision 
-     * @param  int    $count 
-     * @param  bool   $quiet 
+     *
+     * @param  string $path
+     * @param  int    $fromRevision
+     * @param  string $toRevision
+     * @param  int    $count
+     * @param  bool   $quiet
      * @access public
      * @return array
      */
@@ -229,17 +229,17 @@ class Subversion
         foreach($parsedComments->logentry as $entry)
         {
             $log = new stdclass();
-            $log->committer = (string)$entry->author; 
-            $log->revision  = (int)$entry['revision']; 
+            $log->committer = (string)$entry->author;
+            $log->revision  = (int)$entry['revision'];
             $log->comment   = trim((string)$entry->msg);
             $log->time      = date('Y-m-d H:i:s', strtotime($entry->date));
             $log->change    = array();
             if(!empty($entry->paths))
             {
-                foreach($entry->paths->path as $path) 
+                foreach($entry->paths->path as $path)
                 {
                     $pathInfo = array();
-                    foreach($path->attributes() as $attr => $value) $pathInfo[$attr] = (string)$value;    
+                    foreach($path->attributes() as $attr => $value) $pathInfo[$attr] = (string)$value;
                     $log->change[(string)$path] = $pathInfo;
                 }
             }
@@ -257,9 +257,9 @@ class Subversion
 
     /**
      * Blame file.
-     * 
-     * @param  string $path 
-     * @param  int    $revision 
+     *
+     * @param  string $path
+     * @param  int    $revision
      * @access public
      * @return array
      */
@@ -298,7 +298,7 @@ class Subversion
         {
             foreach($parsedResult->target->entry as $line)
             {
-                if($line->commit['revision'] != $revision) 
+                if($line->commit['revision'] != $revision)
                 {
                     $blame = array();
                     $blame['revision']  = (int)$line->commit['revision'];
@@ -327,10 +327,10 @@ class Subversion
 
     /**
      * Diff file.
-     * 
-     * @param  string $path 
-     * @param  int    $fromRevision 
-     * @param  int    $toRevision 
+     *
+     * @param  string $path
+     * @param  int    $fromRevision
+     * @param  int    $toRevision
      * @access public
      * @return array
      */
@@ -355,9 +355,9 @@ class Subversion
 
     /**
      * Cat file.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return string
      */
@@ -380,9 +380,9 @@ class Subversion
 
     /**
      * Get info.
-     * 
-     * @param  string $entry 
-     * @param  string $revision 
+     *
+     * @param  string $entry
+     * @param  string $revision
      * @access public
      * @return object
      */
@@ -421,8 +421,8 @@ class Subversion
 
     /**
      * Exec svn cmd.
-     * 
-     * @param  string $cmd 
+     *
+     * @param  string $cmd
      * @access public
      * @return array
      */
@@ -434,8 +434,8 @@ class Subversion
 
     /**
      * Parse diff.
-     * 
-     * @param  array  $lines 
+     *
+     * @param  array  $lines
      * @access public
      * @return array
      */
@@ -514,9 +514,9 @@ class Subversion
 
     /**
      * Get commit count.
-     * 
-     * @param  int    $commits 
-     * @param  int    $lastVersion 
+     *
+     * @param  int    $commits
+     * @param  int    $lastVersion
      * @access public
      * @return int
      */
@@ -547,7 +547,7 @@ class Subversion
 
     /**
      * Get first revision.
-     * 
+     *
      * @access public
      * @return int
      */
@@ -561,7 +561,7 @@ class Subversion
 
     /**
      * Get latest revision.
-     * 
+     *
      * @access public
      * @return int
      */
@@ -573,9 +573,9 @@ class Subversion
 
     /**
      * Get commits.
-     * 
-     * @param  string $version 
-     * @param  int    $count 
+     *
+     * @param  string $version
+     * @param  int    $count
      * @access public
      * @return array
      */
@@ -608,8 +608,8 @@ class Subversion
         foreach($parsedComments->logentry as $entry)
         {
             $parsedLog            = new stdClass();
-            $parsedLog->committer = (string)$entry->author; 
-            $parsedLog->revision  = (int)$entry['revision']; 
+            $parsedLog->committer = (string)$entry->author;
+            $parsedLog->revision  = (int)$entry['revision'];
             $parsedLog->comment   = trim((string)$entry->msg);
             $parsedLog->time      = date('Y-m-d H:i:s', strtotime($entry->date));
             $logs['commits'][$parsedLog->revision] = $parsedLog;
@@ -632,8 +632,8 @@ class Subversion
 
     /**
      * Replace svn auth.
-     * 
-     * @param  string $cmd 
+     *
+     * @param  string $cmd
      * @access public
      * @return string
      */
@@ -643,11 +643,11 @@ class Subversion
     }
 
     /**
-     * Build command. 
-     * 
-     * @param  string $path 
-     * @param  string $action 
-     * @param  string $param 
+     * Build command.
+     *
+     * @param  string $path
+     * @param  string $action
+     * @param  string $param
      * @access public
      * @return string
      */
@@ -668,8 +668,8 @@ class Subversion
 
     /**
      * Get SVN version.
-     * 
-     * @param  string $client 
+     *
+     * @param  string $client
      * @access public
      * @return string
      */
diff --git a/module/repo/control.php b/module/repo/control.php
index b286075b0d..4982eec6e9 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -1321,9 +1321,16 @@ class repo extends control
         }
         elseif($repo->SCM == 'Git')
         {
+            $gitDir = scandir($repo->path);
+            $files  = '';
+            foreach($gitDir as $path)
+            {
+                if(!in_array($path, array('.', '..', '.git'))) $files .= $repo->path . DS . "$path,";
+            }
+
             $this->app->loadClass('pclzip', true);
             $zip = new pclzip($fileName);
-            if($zip->create($repo->path, PCLZIP_OPT_REMOVE_PATH, $repo->path) === 0) return print(js::alert($zip->errorInfo()) . js::close());
+            if($zip->create($files, PCLZIP_OPT_REMOVE_PATH, $repo->path) === 0) return print(js::alert($zip->errorInfo()) . js::close());
 
             $url = DS . 'data' . DS . 'repo' . DS . $repo->name . '.zip';
         }
@@ -1333,7 +1340,7 @@ class repo extends control
             chdir($savePath);
             $this->scm = $this->app->loadClass('scm');
             $this->scm->setEngine($repo);
-            $this->scm->exec('checkout ' . $repo->path);
+            $this->scm->exec('export ' . $repo->path);
 
             /* Get repo name. */
             $pathList = explode('/', trim($repo->path, '/'));

From 24b36766fb91758a9da75d8d79acd45ce64335ac Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 7 Jul 2022 09:14:30 +0000
Subject: [PATCH 11/40] * Adjuct cfd stat

---
 module/execution/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index b4e6f3e89f..3b3eed6663 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -3318,7 +3318,7 @@ class executionModel extends model
                 foreach($lane->items['closed'] as $item)
                 {
                     $diffTime = $type == 'story' ? strtotime($item['lastEditedDate']) - strtotime($item['openedDate']) : strtotime($item['closedDate']) - strtotime($item['openedDate']);
-                    $day      = floor($diffTime / (3600 * 24));
+                    $day      = round($diffTime / (3600 * 24), 1);
                     if($day > 0) $cycleTime[$item['id']] = $day;
                 }
             }
@@ -3326,7 +3326,7 @@ class executionModel extends model
 
         $itemCount    = count($cycleTime);
         if(!$itemCount) return array('', '');
-        $cycleTimeAvg = round(array_sum($cycleTime) / $itemCount);
+        $cycleTimeAvg = round(array_sum($cycleTime) / $itemCount, 1);
         $throughput   = round(($itemCount * 7) / $cycleTimeAvg, 1) . "{$this->lang->execution->kanbanCardsUnit}/" . $this->lang->execution->week;
 
         return array($cycleTimeAvg, $throughput);

From 07231be2d29e713cf97e70993a6612f2b9683ba6 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 17:23:09 +0800
Subject: [PATCH 12/40] * Code for task#59543.

---
 module/execution/control.php | 20 ++++++++---
 module/story/control.php     | 64 +++++++++++++++++++++++++++---------
 2 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 69b1d06567..c540ec7baf 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3036,14 +3036,24 @@ class execution extends control
 
             if(isonlybody())
             {
-                if($this->app->tab == 'execution' and $object->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
                     $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($objectID, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
-
-                    return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
+                    if($object->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($objectID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($objectID, $execLaneType, $execGroupBy);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent', '', "parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {
diff --git a/module/story/control.php b/module/story/control.php
index a4ff8cd4c4..11b6f87253 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -201,8 +201,8 @@ class story extends control
 
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                     }
@@ -516,15 +516,26 @@ class story extends control
             {
                 $executionID = $executionID ? $executionID : $this->session->execution;
                 $execution   = $this->execution->getByID($executionID);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -736,13 +747,26 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1055,15 +1079,25 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
-
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($execution->id, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {

From 29efcab6287db41ef5285fa8af3145c07f4169db Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 17:42:30 +0800
Subject: [PATCH 13/40] * Code for task#59543.

---
 module/execution/control.php | 20 +++++++++++++++-----
 module/story/control.php     | 33 +++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index c540ec7baf..3acefea218 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3193,15 +3193,25 @@ class execution extends control
             }
 
             $execution = $this->execution->getByID($executionID);
-            if($this->app->tab == 'execution' and $execution->type == 'kanban')
+            if($this->app->tab == 'execution')
             {
                 $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                 $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                 $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                $kanbanData    = json_encode($kanbanData);
-
-                return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
+                if($execution->type == 'kanban')
+                {
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                    $kanbanData = json_encode($kanbanData);
+                    return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
+                }
+                else
+                {
+                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy);
+                    $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                    $kanbanData = $kanbanData[$kanbanType];
+                    $kanbanData = json_encode($kanbanData);
+                    return print(js::closeModal('parent', '', "parent.updateKanban(\"story\", $kanbanData)"));
+                }
             }
 
             return print(js::reload('parent'));
diff --git a/module/story/control.php b/module/story/control.php
index 11b6f87253..716a0f60f9 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1314,7 +1314,17 @@ class story extends control
 
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success'));
 
-            if($this->app->tab == 'execution' and $from == 'taskkanban') return print(js::reload('parent'));
+            if($this->app->tab == 'execution' and $from == 'taskkanban')
+            {
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                $kanbanType    = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                $kanbanData    = $kanbanData[$kanbanType];
+                $kanbanData    = json_encode($kanbanData);
+                return print(js::closeModal('parent', '', "parent.updateKanban(\"story\", $kanbanData)"));
+            }
 
             if(isonlybody()) return print(js::reload('parent.parent'));
 
@@ -1468,16 +1478,27 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban')
+                if($this->app->tab == 'execution')
                 {
                     $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
+
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
-
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    }
                 }
                 else
                 {

From 05a1b2be02d3ae376419acaf0898d81a7f83d53d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 17:52:30 +0800
Subject: [PATCH 14/40] * Code for task#59543.

---
 module/story/control.php | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 716a0f60f9..bcd74ba356 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1357,7 +1357,36 @@ class story extends control
 
             $this->executeHooks($storyID);
 
-            if(isonlybody()) return print(js::reload('parent.parent'));
+            if(isonlybody())
+            {
+                $execution = $this->execution->getByID($this->session->execution);
+                if($this->app->tab == 'execution')
+                {
+                    $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
+
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'story' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"story\", $kanbanData)"));
+                    }
+                }
+                else
+                {
+                    return print(js::closeModal('parent.parent', 'this', "function(){parent.parent.location.reload();}"));
+                }
+            }
 
             $module = $from == 'project' ? 'projectstory' : 'story';
             if(defined('RUN_MODE') and RUN_MODE == 'api') return $this->send(array('status' => 'success', 'data' => $storyID));

From 38dcc95cb4ba50a8c32c0c21cd046a81bdf9557d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 7 Jul 2022 18:08:59 +0800
Subject: [PATCH 15/40] * Code for task#59543.

---
 module/bug/control.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 5806d9f831..478ce03b7d 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1914,16 +1914,27 @@ class bug extends control
             if(isonlybody())
             {
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    if(isset($execution->type) and $execution->type == 'kanban')
+                    {
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($bug->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'bug' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"bug\", $kanbanData)"));
+                    }
                 }
                 else
                 {

From be1ca9562455e6af2b8709c1a72676650a0b62f7 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 08:15:42 +0800
Subject: [PATCH 16/40] * Fix bug #24977.

---
 module/bug/view/batchcreate.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 7632bd4b30..441e988884 100755
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -119,7 +119,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
             <td>
               <div class='input-group'>
                 <div class="input-control has-icon-right">
-                  <?php echo html::input("title[$i]", $bugTitle, "class='form-control'") . html::hidden("uploadImage[$i]", $fileName);?>
+                  <?php echo html::input("title[$i]", $bugTitle, "class='form-control title-import'") . html::hidden("uploadImage[$i]", $fileName);?>
                   <div class="colorpicker">
                     <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"><span class="cp-title"></span><span class="color-bar"></span><i class="ic"></i></button>
                     <ul class="dropdown-menu clearfix">

From d976a4caa8219e9445fef3d2cec495778ed2919a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 08:28:36 +0800
Subject: [PATCH 17/40] * Fix bug #24697.

---
 module/install/js/license.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/install/js/license.js b/module/install/js/license.js
index 99df7e1e08..a6f1c1055b 100644
--- a/module/install/js/license.js
+++ b/module/install/js/license.js
@@ -1,4 +1,8 @@
 $(document).ready(function()
 {
-    $('#agree').change(function(){$('.btn-install').attr('disabled', !$(this).prop('checked'));}); 
+    $('#agree').change(function()
+    {
+        $('.btn-install').attr('disabled', !$(this).prop('checked'));
+        $('.btn-install').css('pointer-events', $(this).prop('checked') ? 'auto' : 'none');
+    }); 
 });

From b4a9f36ad96536bd4401ffe32427adb89a14d37a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 08:50:07 +0800
Subject: [PATCH 18/40] * Fix bug #24972.

---
 module/product/js/create.js         |  2 +-
 module/product/view/create.html.php | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module/product/js/create.js b/module/product/js/create.js
index f36e5643c6..71de80e4ee 100644
--- a/module/product/js/create.js
+++ b/module/product/js/create.js
@@ -1,6 +1,6 @@
 $(function()
 {
-    if(manageLinePriv && (programID || systemMode == 'classic')) $('#line_chosen').addClass('hidden');
+    if(manageLinePriv && (hiddenLine || systemMode == 'classic')) $('#line_chosen').addClass('hidden');
     $('#lineName').css('border-left-color', '');
 })
 /**
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index e2dc52fb39..61ec2f2747 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -35,12 +35,15 @@
             <?php if(common::hasPriv('product', 'manageLine') and ($config->systemMode == 'classic' or $programID)):?>
             <td>
               <div class='input-group'>
-                <?php echo html::select("line", $lines, '', "class='form-control hidden line-exist chosen'");?>
-                <?php echo html::input("lineName", '', "class='form-control line-no-exist'");?>
+                <?php $hiddenLine     = count($lines) > 1 ? '' : 'hidden';?>
+                <?php $hiddenLineName = $hiddenLine ? '' : 'hidden';?>
+                <?php $checkedNewLine = $hiddenLine ? 'checked' : '';?>
+                <?php echo html::select("line", $lines, '', "class='form-control line-exist chosen $hiddenLine'");?>
+                <?php echo html::input("lineName", '', "class='form-control line-no-exist $hiddenLineName'");?>
                 <?php if(count($lines)):?>
                 <span class='input-group-addon'>
                   <div class="checkbox-primary">
-                    <input type="checkbox" name="newLine" value="0" checked onchange="toggleLine(this)" id="newLine0" />
+                  <input type="checkbox" name="newLine" value="0" <?php echo $checkedNewLine;?> onchange="toggleLine(this)" id="newLine0" />
                     <label for="newLine0"><?php echo $lang->product->newLine;?></label>
                   </div>
                 </span>
@@ -123,4 +126,5 @@
     </form>
   </div>
 </div>
+<?php js::set('hiddenLine', $hiddenLine);?>
 <?php include '../../common/view/footer.html.php';?>

From a2fbd1f47ef580592f2fb0657c89160d9b71eee0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 08:56:55 +0800
Subject: [PATCH 19/40] * Fix bug #24961.

---
 module/story/view/batchcreate.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index f161b56f0d..50a33c7185 100755
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include './header.html.php';?>
+<?php if($forceReview) $config->story->create->requiredFields .= ',review';?>
 <?php js::set('showFields', $showFields);?>
 <?php js::set('requiredFields', $config->story->create->requiredFields);?>
 <div id="mainContent" class="main-content">

From 1681419642a6198d36a3981ade49c8b1978ee258 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 8 Jul 2022 09:03:00 +0800
Subject: [PATCH 20/40] * Fix bug for sort module.

---
 module/tree/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index 8f9005ffd7..bad64ebd6e 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -419,7 +419,7 @@ class tree extends control
         if(!empty($_POST))
         {
             $this->tree->updateOrder($_POST['orders']);
-            if($viewType == 'story' and !empty($rootID) and !empty($moduleID)) $this->action->create('module', $rootID, 'moved', '', $moduleID);
+            if($viewType == 'story' and !empty($rootID) and !empty($moduleID)) $this->loadModel('action')->create('module', $rootID, 'moved', '', $moduleID);
             die(js::reload('parent'));
         }
     }

From ce191b4f9e18fb8b847042b84a06969e7faee31e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 09:04:57 +0800
Subject: [PATCH 21/40] * Fix bug #24945.

---
 module/execution/view/create.html.php | 2 +-
 module/execution/view/kanban.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index b83a4d36e3..18fff781b3 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -228,7 +228,7 @@
         </tr>
         <tr>
           <th id='c-name'><?php echo $lang->kanban->laneHeight;?></th>
-          <td class='laneHeightBox' colspan='2'><?php echo nl2br(html::radio('heightType', $lang->kanbanlane->heightTypeList, 'auto', "onclick='setCardCount(this.value);'"));?></td>
+          <td class='laneHeightBox' colspan='3'><?php echo nl2br(html::radio('heightType', $lang->kanbanlane->heightTypeList, 'auto', "onclick='setCardCount(this.value);'"));?></td>
         </tr>
         <tr class="hidden" id='cardBox'>
           <th class='c-count'><?php echo $lang->kanban->cardCount;?></th>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index f7855a1d88..eaa09204f0 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -160,7 +160,7 @@ js::set('priv',
         $width    = $this->app->getClientLang() == 'en' ? '750' : '650';
         if($printCreateRegion) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $lang->kanban->createRegion, '', "class='iframe btn btn-link text-left'") . '</li>';
         $kanbanActions = '';
-        if(common::hasPriv('execution', 'edit')) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'edit', "executionID=$execution->id", '', true), '<i class="icon icon-edit"></i>' . $lang->kanban->edit, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
+        if(common::hasPriv('execution', 'edit')) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'edit', "executionID=$execution->id", '', true), '<i class="icon icon-edit"></i>' . $lang->kanban->edit, '', "class='iframe btn btn-link text-left' data-width='80%'") . '</li>';
         if(common::hasPriv('execution', 'start')) $kanbanActions .= '<li class="startButton hidden">' . html::a(helper::createLink('execution', 'start', "executionID=$execution->id&from=kanban", '', true), '<i class="icon icon-play"></i>' . $lang->execution->start, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
         if(common::hasPriv('execution', 'putoff')) $kanbanActions .= '<li class="putoffButton hidden">' . html::a(helper::createLink('execution', 'putoff', "executionID=$execution->id&from=kanban", '', true), '<i class="icon icon-calendar"></i>' . $lang->execution->putoff, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
         if(common::hasPriv('execution', 'suspend')) $kanbanActions .= '<li class="suspendButton hidden">' . html::a(helper::createLink('execution', 'suspend', "executionID=$execution->id&from=kanban", '', true), '<i class="icon icon-pause"></i>' . $lang->execution->suspend, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';

From f6d94ad4cb1dc1449d3c6f825b6d91df52df4de2 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Fri, 8 Jul 2022 09:06:39 +0800
Subject: [PATCH 22/40] * Fix bug #24848#24817.

---
 module/execution/control.php       |  10 +-
 module/execution/js/cfd.js         | 183 +++++++++++++++--------------
 module/execution/model.php         |   4 +-
 module/execution/view/cfd.html.php |   6 +
 4 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 19555b5011..1ea61762b0 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1378,12 +1378,15 @@ class execution extends control
 
         list($cycleTimeAvg, $throughput) = $this->execution->getCFDStatistics($executionID, $dateList, $type);
 
+        $chartData = $this->execution->buildCFDData($executionID, $dateList, $type);
+        if(isset($chartData['line'])) $chartData['line'] = array_reverse($chartData['line']);
+
         $this->view->title         = $this->lang->execution->CFD;
         $this->view->type          = $type;
         $this->view->execution     = $execution;
         $this->view->executionName = $execution->name;
         $this->view->executionID   = $executionID;
-        $this->view->chartData     = $this->execution->buildCFDData($executionID, $dateList, $type);
+        $this->view->chartData     = $chartData;
         $this->view->cycleTimeAvg  = $cycleTimeAvg;
         $this->view->throughput    = $throughput;
         $this->display();
@@ -1397,10 +1400,9 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function computeCFD($reload = 'no', $executionID = 0, $date = '')
+    public function computeCFD($reload = 'no', $executionID = 0)
     {
-        $date = date('Y-m-d', strtotime($date));
-        $this->execution->computeCFD($executionID, $date);
+        $this->execution->computeCFD($executionID);
         if($reload == 'yes') return print(js::reload('parent'));
     }
 
diff --git a/module/execution/js/cfd.js b/module/execution/js/cfd.js
index 4753e71973..39f7633bdf 100644
--- a/module/execution/js/cfd.js
+++ b/module/execution/js/cfd.js
@@ -2,105 +2,112 @@ $(function()
 {
     $('[data-toggle=tooltip]').tooltip();
 
-    if(Object.keys(chartData).length || 1)
+    var i = 0;
+    var series     = [];
+    var colors     = ['#33B4DB', '#7ECF69', '#FFC73A', '#FF5A61', '#50C8D0', '#AF5AFF', '#4EA3FF', '#FF8C5A', '#6C73FF'];
+    //var background = ['#E1F4FA', '#ECF8E9', '#FFF7E2', '#FFE7E8', '#E5F7F8', '#F3E7FF', '#E5F1FF', '#FFEEE7', '#E9EAFF'];
+
+    $.each(chartData['line'], function(label, set)
     {
-        var i = 0;
-        var series     = [];
-        var colors     = ['#33B4DB', '#7ECF69', '#FFC73A', '#FF5A61', '#50C8D0', '#AF5AFF', '#4EA3FF', '#FF8C5A', '#6C73FF'];
-        //var background = ['#E1F4FA', '#ECF8E9', '#FFF7E2', '#FFE7E8', '#E5F7F8', '#F3E7FF', '#E5F1FF', '#FFEEE7', '#E9EAFF'];
-
-        $.each(chartData['line'], function(label, set)
-        {
-            series.push({
-              name: label,
-              type: 'line',
-              stack: 'Total',
-              color: colors[i],
-              areaStyle: {
-                color: colors[i],
-                opacity: 0.2
-              },
-              emphasis: {
-                focus: 'series'
-              },
-              data: eval(set)
-            })
-            i ++;
+        series.push({
+          name: label,
+          type: 'line',
+          stack: 'Total',
+          color: colors[i],
+          areaStyle: {
+            color: colors[i],
+            opacity: 0.2
+          },
+          itemStyle: {
+            normal: {
+              lineStyle:{
+                width:1//设置线条粗细
+              }
+            }
+          },
+          emphasis: {
+            focus: 'series'
+          },
+          data: eval(set)
         })
+        i ++;
+    })
 
-        var chartDom = document.getElementById('cfdChart');
-        var CFD      = echarts.init(chartDom);
-        var option;
+    var chartDom = document.getElementById('cfdChart');
+    var CFD      = echarts.init(chartDom);
+    var option;
 
-        option = {
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'cross',
-              label: {
-                backgroundColor: '#6a7985'
-              }
-            }
-          },
-          legend: {
-            data: Object.keys(chartData['line'])
-          },
-          grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '3%',
-            containLabel: true
-          },
-          xAxis: [
+    option = {
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
+          label: {
+            backgroundColor: '#6a7985'
+          }
+        },
+        textStyle: {
+          fontWeight: 100
+        }
+      },
+      legend: {
+        data: Object.keys(chartData['line']).reverse()
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: [
+      {
+          type: 'category',
+          boundaryGap: false,
+          data: chartData['labels'],
+          name: XUnit,
+          axisLine:
           {
-              type: 'category',
-              boundaryGap: false,
-              data: chartData['labels'],
-              name: XUnit,
-              axisLine:
+              show: true,
+              lineStyle:
+              {
+                  color: '#999',
+                  width:1
+              }
+          }
+      }],
+      yAxis: [
+      {
+          type: 'value',
+          minInterval: 1,
+          name: YUnit,
+          nameTextStyle:
+          {
+              fontWeight: 'normal'
+          },
+          axisPointer:
+          {
+              label:
               {
                   show: true,
-                  lineStyle:
-                  {
-                      color: '#999',
-                      width:1
-                  }
-              }
-          }],
-          yAxis: [
+                  precision: 0
+              },
+          },
+          axisLine:
           {
-              type: 'value',
-              minInterval: 1,
-              name: YUnit,
-              nameTextStyle:
+              show: true,
+              lineStyle:
               {
-                  fontWeight: 'normal'
-              },
-              axisPointer:
-              {
-                  label:
-                  {
-                      show: true,
-                      precision: 0
-                  },
-              },
-              axisLine:
-              {
-                  show: true,
-                  lineStyle:
-                  {
-                      color: ['#999'],
-                      width: 1
-                  }
+                  color: ['#999'],
+                  width: 1
               }
-            }
-          ],
-          series: series,
-        };
+          }
+        }
+      ],
+      series: series,
+    };
 
-        option && CFD.setOption(option);
-        window.addEventListener('resize', CFD.resize);
-    }
+    option && CFD.setOption(option);
+    window.addEventListener('resize', CFD.resize);
 
     $('#type').change(function()
     {
diff --git a/module/execution/model.php b/module/execution/model.php
index 16538f0050..88a1884b80 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -3006,9 +3006,9 @@ class executionModel extends model
      * @access public
      * @return array
      */
-    public function computeCFD($executionID = 0, $date = '')
+    public function computeCFD($executionID = 0)
     {
-        $today = $date ? $date : helper::today();
+        $today = helper::today();
         $executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
             ->where('type')->eq('kanban')
             ->andWhere('status')->notin('done,closed,suspended')
diff --git a/module/execution/view/cfd.html.php b/module/execution/view/cfd.html.php
index 3a8b5de644..998e560547 100644
--- a/module/execution/view/cfd.html.php
+++ b/module/execution/view/cfd.html.php
@@ -33,6 +33,7 @@
 </div>
 <div id='mainContent' class='main-content'>
   <h2 class='text-center'><?php echo $executionName . ' - ' . zget($lang->execution->cfdTypeList, $type) . $lang->execution->CFD;?></h2>
+  <?php if(isset($chartData['labels']) and count($chartData['labels']) != 1): ?>
   <div id="cfdWrapper">
     <div id="cfdChart" style="width: 1200px; height: 600px"></div>
     <div id="burnStatistics">
@@ -42,5 +43,10 @@
       <h3><?php echo $throughput ? $throughput : $lang->noData;?></h3>
     </div>
   </div>
+  <?php else:?>
+  <div class="table-empty-tip">
+  <p><span class="text-muted"><?php echo $lang->execution->noPrintData;?></span></p>
+  </div>
+  <?php endif; ?>
 </div>
 <?php include '../../common/view/footer.html.php';?>

From 1df55e32a781efea91c0c082544c58f4bb5cf1da Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Fri, 8 Jul 2022 09:18:53 +0800
Subject: [PATCH 23/40] * Fix bug #24848#24817.

---
 module/execution/js/cfd.js | 167 +++++++++++++++++++------------------
 1 file changed, 85 insertions(+), 82 deletions(-)

diff --git a/module/execution/js/cfd.js b/module/execution/js/cfd.js
index 39f7633bdf..8ccc23f65c 100644
--- a/module/execution/js/cfd.js
+++ b/module/execution/js/cfd.js
@@ -7,107 +7,110 @@ $(function()
     var colors     = ['#33B4DB', '#7ECF69', '#FFC73A', '#FF5A61', '#50C8D0', '#AF5AFF', '#4EA3FF', '#FF8C5A', '#6C73FF'];
     //var background = ['#E1F4FA', '#ECF8E9', '#FFF7E2', '#FFE7E8', '#E5F7F8', '#F3E7FF', '#E5F1FF', '#FFEEE7', '#E9EAFF'];
 
-    $.each(chartData['line'], function(label, set)
+    if(Object.keys(chartData).length)
     {
-        series.push({
-          name: label,
-          type: 'line',
-          stack: 'Total',
-          color: colors[i],
-          areaStyle: {
+        $.each(chartData['line'], function(label, set)
+        {
+          series.push({
+            name: label,
+            type: 'line',
+            stack: 'Total',
             color: colors[i],
-            opacity: 0.2
-          },
-          itemStyle: {
-            normal: {
-              lineStyle:{
-                width:1//设置线条粗细
+            areaStyle: {
+              color: colors[i],
+              opacity: 0.2
+            },
+            itemStyle: {
+              normal: {
+                lineStyle:{
+                  width:1//设置线条粗细
+                }
               }
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: eval(set)
+          })
+          i ++;
+        })
+
+        var chartDom = document.getElementById('cfdChart');
+        var CFD      = echarts.init(chartDom);
+        var option;
+
+        option = {
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'cross',
+              label: {
+                backgroundColor: '#6a7985'
+              }
+            },
+            textStyle: {
+              fontWeight: 100
             }
           },
-          emphasis: {
-            focus: 'series'
+          legend: {
+            data: Object.keys(chartData['line']).reverse()
           },
-          data: eval(set)
-        })
-        i ++;
-    })
-
-    var chartDom = document.getElementById('cfdChart');
-    var CFD      = echarts.init(chartDom);
-    var option;
-
-    option = {
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'cross',
-          label: {
-            backgroundColor: '#6a7985'
-          }
-        },
-        textStyle: {
-          fontWeight: 100
-        }
-      },
-      legend: {
-        data: Object.keys(chartData['line']).reverse()
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true
-      },
-      xAxis: [
-      {
-          type: 'category',
-          boundaryGap: false,
-          data: chartData['labels'],
-          name: XUnit,
-          axisLine:
-          {
-              show: true,
-              lineStyle:
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: [
+            {
+              type: 'category',
+              boundaryGap: false,
+              data: chartData['labels'],
+              name: XUnit,
+              axisLine:
               {
+                show: true,
+                lineStyle:
+                {
                   color: '#999',
                   width:1
+                }
               }
-          }
-      }],
-      yAxis: [
-      {
-          type: 'value',
-          minInterval: 1,
-          name: YUnit,
-          nameTextStyle:
-          {
-              fontWeight: 'normal'
-          },
-          axisPointer:
-          {
-              label:
+            }],
+          yAxis: [
+            {
+              type: 'value',
+              minInterval: 1,
+              name: YUnit,
+              nameTextStyle:
               {
+                fontWeight: 'normal'
+              },
+              axisPointer:
+              {
+                label:
+                {
                   show: true,
                   precision: 0
+                },
               },
-          },
-          axisLine:
-          {
-              show: true,
-              lineStyle:
+              axisLine:
               {
+                show: true,
+                lineStyle:
+                {
                   color: ['#999'],
                   width: 1
+                }
               }
-          }
-        }
-      ],
-      series: series,
-    };
+            }
+          ],
+          series: series,
+        };
 
-    option && CFD.setOption(option);
-    window.addEventListener('resize', CFD.resize);
+        option && CFD.setOption(option);
+        window.addEventListener('resize', CFD.resize);
+    }
 
     $('#type').change(function()
     {

From a01d530a0a0965ae7a06c780fe8033b25bcded4a Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 8 Jul 2022 01:38:33 +0000
Subject: [PATCH 24/40] * Hide cfd stat

---
 module/execution/control.php       | 4 +---
 module/execution/css/cfd.css       | 9 +++++----
 module/execution/view/cfd.html.php | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 5c26642e89..f9a8cd61aa 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1376,7 +1376,7 @@ class execution extends control
         list($begin, $end) = $this->execution->getBeginEnd4CFD($execution);
         $dateList = date::getDateList($begin, $end, 'Y-m-d', '');
 
-        list($cycleTimeAvg, $throughput) = $this->execution->getCFDStatistics($executionID, $dateList, $type);
+        //list($cycleTimeAvg, $throughput) = $this->execution->getCFDStatistics($executionID, $dateList, $type);
 
         $chartData = $this->execution->buildCFDData($executionID, $dateList, $type);
         if(isset($chartData['line'])) $chartData['line'] = array_reverse($chartData['line']);
@@ -1387,8 +1387,6 @@ class execution extends control
         $this->view->executionName = $execution->name;
         $this->view->executionID   = $executionID;
         $this->view->chartData     = $chartData;
-        $this->view->cycleTimeAvg  = $cycleTimeAvg;
-        $this->view->throughput    = $throughput;
         $this->display();
     }
 
diff --git a/module/execution/css/cfd.css b/module/execution/css/cfd.css
index 4022633289..47646a87bd 100644
--- a/module/execution/css/cfd.css
+++ b/module/execution/css/cfd.css
@@ -4,26 +4,27 @@
 .pull-left .input-control {margin-right: 10px;}
 
 #cfdWrapper {max-width: 1450px; padding: 25px 0px 10px; position: relative}
+#cfdChart {margin: 0 auto;}
 @media screen and (max-width: 1920px)
 {
 #cfdChart {width:1400px !important; height:600px !important}
-#mainContent {min-width: 1550px !important;}
+#mainContent {min-width: 1400px !important;}
 #burnStatistics {left: 1400px !important;}
 }
 @media screen and (max-width: 1680px)
 {
 #cfdChart {width:1150px !important; height:500px !important}
-#mainContent {min-width: 1350px !important;}
+#mainContent {min-width: 1150px !important;}
 #burnStatistics {left: 1150px !important;}
 }
 @media screen and (max-width: 1366px)
 {
 #cfdChart {width:1000px !important; height:400px !important}
-#mainContent {min-width: 1200px !important;}
+#mainContent {min-width: 1000px !important;}
 #burnStatistics {left: 1000px !important;}
 }
 
-#mainContent {min-width: 1400px;}
+#mainContent {min-width: 1200px;}
 #burnStatistics {position: absolute; width: 180px; left: 1200px; height: 200px; top: 20%; margin-top: -30px; line-height: 30px; color: #838A9D; font-size: 12px; border: 1px solid #dcdcdc; background-color: #F8F8F8; padding: 15px 20px; color: #3c4353; border-radius: 8px;}
 #burnStatistics .bg-primary {margin-right: 5px;}
 #burnStatistics .icon-help {color: black;}
diff --git a/module/execution/view/cfd.html.php b/module/execution/view/cfd.html.php
index 998e560547..c6c2c9d696 100644
--- a/module/execution/view/cfd.html.php
+++ b/module/execution/view/cfd.html.php
@@ -36,7 +36,7 @@
   <?php if(isset($chartData['labels']) and count($chartData['labels']) != 1): ?>
   <div id="cfdWrapper">
     <div id="cfdChart" style="width: 1200px; height: 600px"></div>
-    <div id="burnStatistics">
+    <div id="burnStatistics" class="hidden">
       <div class="stat-title"><span class="bg-primary">&nbsp;</span> <?php echo $lang->execution->charts->cfd->cycleTime;?> <i class="icon icon-help" data-toggle="tooltip" data-tip-class="tooltip-help" data-placement="bottom" title="<?php echo $lang->execution->charts->cfd->cycleTimeTip;?>"></i></div>
       <h3><?php echo $cycleTimeAvg ? ($cycleTimeAvg . $lang->day) : $lang->noData;?></h3>
       <div class="stat-title"><span class="bg-primary">&nbsp;</span> <?php echo $lang->execution->charts->cfd->throughput;?> <i class="icon icon-help" data-toggle="tooltip" data-tip-class="tooltip-help" data-placement="bottom" title="<?php echo $lang->execution->charts->cfd->throughputTip;?>"></i></div>

From b8c23acb6970db96b2f8dfe010c452d21713b655 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 8 Jul 2022 01:42:17 +0000
Subject: [PATCH 25/40] * Adjust code

---
 module/execution/view/cfd.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/cfd.html.php b/module/execution/view/cfd.html.php
index c6c2c9d696..f8f5b4127e 100644
--- a/module/execution/view/cfd.html.php
+++ b/module/execution/view/cfd.html.php
@@ -38,9 +38,9 @@
     <div id="cfdChart" style="width: 1200px; height: 600px"></div>
     <div id="burnStatistics" class="hidden">
       <div class="stat-title"><span class="bg-primary">&nbsp;</span> <?php echo $lang->execution->charts->cfd->cycleTime;?> <i class="icon icon-help" data-toggle="tooltip" data-tip-class="tooltip-help" data-placement="bottom" title="<?php echo $lang->execution->charts->cfd->cycleTimeTip;?>"></i></div>
-      <h3><?php echo $cycleTimeAvg ? ($cycleTimeAvg . $lang->day) : $lang->noData;?></h3>
+      <h3><?php echo !empty($cycleTimeAvg) ? ($cycleTimeAvg . $lang->day) : $lang->noData;?></h3>
       <div class="stat-title"><span class="bg-primary">&nbsp;</span> <?php echo $lang->execution->charts->cfd->throughput;?> <i class="icon icon-help" data-toggle="tooltip" data-tip-class="tooltip-help" data-placement="bottom" title="<?php echo $lang->execution->charts->cfd->throughputTip;?>"></i></div>
-      <h3><?php echo $throughput ? $throughput : $lang->noData;?></h3>
+      <h3><?php echo !empty($throughput) ? $throughput : $lang->noData;?></h3>
     </div>
   </div>
   <?php else:?>

From 0951f5b56d56de579657eca828035886e0f10574 Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Fri, 8 Jul 2022 01:45:48 +0000
Subject: [PATCH 26/40]  * Fix bug #24840,24821.

---
 module/job/control.php                    | 2 +-
 module/repo/view/ajaxgetdropmenu.html.php | 6 +++---
 module/repo/view/browse.html.php          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/job/control.php b/module/job/control.php
index 8b834d7008..ac4677c3c0 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -22,7 +22,7 @@ class job extends control
     public function __construct($moduleName = '', $methodName = '')
     {
         parent::__construct($moduleName, $methodName);
-        if($methodName != 'browse') $this->loadModel('ci')->setMenu();
+        if($this->app->methodName != 'browse') $this->loadModel('ci')->setMenu();
         $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
     }
 
diff --git a/module/repo/view/ajaxgetdropmenu.html.php b/module/repo/view/ajaxgetdropmenu.html.php
index fd13277e08..a110cc2bc1 100644
--- a/module/repo/view/ajaxgetdropmenu.html.php
+++ b/module/repo/view/ajaxgetdropmenu.html.php
@@ -12,17 +12,17 @@
 ?>
 <style>
 #dropMenu .tree li {padding: 3px 0 0 10px;}
+#dropMenu .tree li.has-list.open:before {border-left: 0px;}
+#dropMenu .tree li > a {max-width: 100%; line-height: 20px; border-radius: 2px; padding-top: 5px;}
 #dropMenu .col-left {padding: 0;}
 #dropMenu .label {margin-left: 3px;}
 #dropMenu .hide-in-search {padding-left: 8px;}
 #dropMenu .hide-in-search .hidden {display: block !important; visibility: inherit !important;}
 #dropMenuRepo > div.table-row > div > div > ul > li > div {padding-left: 10px;}
-#dropMenu .tree li.has-list.open:before {border-left: 0px;}
 #dropMenu ul.tree-angles {margin-bottom: 0;}
 #dropMenu {margin: 0;}
 #dropMenu ul > li > ul > li > a:hover {color: white; background-color: #0c64eb; text-decoration: none;}
-#dropMenu .tree li > a {max-width: 100%;}
-#dropMenu .tree li > a {line-height: 20px; border-radius: 2px;}
+#dropMenu .tree .has-list > ul > li {padding-top: 0;}
 li > a.selected {color: #3123ae !important; background: #f2eafc !important; line-height: 20px; border-radius: 5px;}
 .search-list .list-group {padding: 7px 10px;}
 #swapper li>div.hide-in-search>a:focus, #swapper li>div.hide-in-search>a:hover {color: #838a9d; cursor: default;}
diff --git a/module/repo/view/browse.html.php b/module/repo/view/browse.html.php
index 9553bfc7b7..7fbff43146 100644
--- a/module/repo/view/browse.html.php
+++ b/module/repo/view/browse.html.php
@@ -30,7 +30,7 @@
               <ul class="tree tree-angles" data-ride="tree" data-idx="0">
                 <li data-idx='branch' data-id='branch' class='has-list open in' style='cursor: pointer;'>
                   <i class='list-toggle icon'></i>
-                  <div class='hide-in-search'><a class='text-muted' title='<?php echo $lang->repo->branch;?>'><?php echo $lang->repo->branch;?></a></div>
+                  <div class='hide-in-search'><a class='text-muted not-list-item' title='<?php echo $lang->repo->branch;?>'><?php echo $lang->repo->branch;?></a></div>
                   <ul data-idx='branch'>
                     <?php
                     foreach($branches as $branchName)
@@ -45,7 +45,7 @@
                 </li>
                 <li data-idx='tag' data-id='tag' class='has-list open in' style='cursor: pointer;'>
                   <i class='list-toggle icon'></i>
-                  <div class='hide-in-search'><a class='text-muted' title='<?php echo $lang->repo->tag;?>'><?php echo $lang->repo->tag;?></a></div>
+                  <div class='hide-in-search'><a class='text-muted not-list-item' title='<?php echo $lang->repo->tag;?>'><?php echo $lang->repo->tag;?></a></div>
                   <ul data-idx='tag'>
                     <?php
                     foreach($tags as $tagName)

From ea75f32195759ae7466db461a91912238ab64ef4 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 8 Jul 2022 01:46:15 +0000
Subject: [PATCH 27/40] * Adjsut CSS.

---
 module/kanban/view/createexeclane.html.php | 2 +-
 module/search/view/buildform.html.php      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/kanban/view/createexeclane.html.php b/module/kanban/view/createexeclane.html.php
index e1846eda6d..4a04460bcf 100644
--- a/module/kanban/view/createexeclane.html.php
+++ b/module/kanban/view/createexeclane.html.php
@@ -50,7 +50,7 @@
           <th><?php echo $lang->kanbanlane->color;?></th>
           <td colspan='3'>
             <div id='color-picker'></div>
-            <?php echo html::input('color', '#7ec5ff', "class='hidden'");?>
+            <?php echo html::input('color', '#3C4353', "class='hidden'");?>
           </td>
         </tr>
         <tr>
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 2203a44222..b85a370d8c 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -64,7 +64,10 @@ $formId = 'searchForm-' . uniqid('');
 html[lang^='zh-'] .fieldWidth {width: 110px !important;}
 html[lang^='zh-'] .operatorWidth {width: 90px !important;}
 .table tbody tr td input {display: block !important;}
-#save-query {color: #0061f2;}
+
+#save-query {float: unset !important; position: absolute; right: 50px;}
+#save-query .text {top: 0px;}
+#save-query .text:after {border-bottom: 0px solid #0c64eb;}
 </style>
 <?php if($style != 'simple'):?>
   <div id='toggle-queries'>
@@ -245,7 +248,7 @@ foreach($fieldParams as $fieldName => $param)
         echo html::submitButton($lang->search->common, '', 'btn btn-primary') . " &nbsp; ";
         if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
         echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
-        if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition, '', "class='btn-save-form btn btn-link iframe pull-right' id='save-query'");
+        if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe pull-right' id='save-query'");
         echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
         ?>
       </td>

From f8c7be2001cddd6ec50f6e4eebcd0cdb720cef62 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 8 Jul 2022 01:47:03 +0000
Subject: [PATCH 28/40] * Finish task #59681.

---
 module/kanban/control.php |   3 +-
 module/task/control.php   | 335 +++++++++++++++++++++-----------------
 2 files changed, 188 insertions(+), 150 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 6b2a0a43cd..751a76400b 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1482,7 +1482,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function deleteObjectCard($objectType, $objectID, $regionID, $from = '')
+    public function deleteObjectCard($objectType, $objectID, $regionID)
     {
         if(!($objectType == 'task' or $objectType == 'story' or $objectType == 'bug')) return false;
         $table = 'TABLE_' . strtoupper($objectType);
@@ -1493,7 +1493,6 @@ class kanban extends control
         $browseType  = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType;
         $groupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
         $kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy);
-        if($from == 'taskkanban') $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($kanbanID, $browseType, $groupBy);
 
         return print(json_encode($kanbanGroup));
     }
diff --git a/module/task/control.php b/module/task/control.php
index 2eff1674c9..aeefa2588c 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -180,24 +180,27 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution' or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->kanban->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"task\", $kanbanData)"));
+                        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -364,24 +367,27 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($thlis->app->tab == 'execution' or $this->config->vision = 'lite')
                 {
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($executionID, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -533,25 +539,28 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -770,24 +779,29 @@ class task extends control
             if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'success'));
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $task          = $this->task->getById($taskID);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroup, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1029,26 +1043,29 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1250,26 +1267,29 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1349,27 +1369,30 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $task          = $this->task->getById($taskID);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1502,25 +1525,28 @@ class task extends control
                     }
                 }
 
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1675,27 +1701,30 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $task          = $this->task->getById($taskID);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1820,7 +1849,17 @@ class task extends control
             $this->executeHooks($taskID);
 
             if(isonlybody()) return print(js::reload('parent.parent'));
-            if($from == 'taskkanban') return print(js::reload('parent'));
+            if($from == 'taskkanban')
+            {
+                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                $kanbanData    = $this->loadModel('kanban')->getExecutionKanban($this->session->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                $kanbanType    = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                $kanbanData    = $kanbanData[$kanbanType];
+                $kanbanData    = json_encode($kanbanData);
+                return print(js::closeModal('parent', '', "parent.updateKanban(\"task\", $kanbanData)"));
+            }
 
             $locateLink = $this->session->taskList ? $this->session->taskList : $this->createLink('execution', 'task', "executionID={$task->execution}");
             return print(js::locate($locateLink, 'parent'));

From 38cc476bb937527973216ce3d78ca64ada5a63dd Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 8 Jul 2022 09:47:22 +0800
Subject: [PATCH 29/40]  * fix bug #22749.

---
 module/common/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/common/model.php b/module/common/model.php
index bf67af7fe6..2152c742a6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2416,6 +2416,7 @@ EOD;
           ($module == 'my' and strpos('|changepassword|preference|', "|{$method}|") !== false) or
           ($module == 'file' and strpos('|read|download|uploadimages|ajaxwopifiles|', "|{$method}|") !== false) or
           ($module == 'sso' and $method == 'login') or
+          ($module == 'report' && $method == 'annualdata') or
           ($module == 'traincourse' and $method == 'ajaxuploadlargefile'))
         {
             return;

From 102326db4fb8fefddc32e398f963f93adf29f6c4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 09:48:08 +0800
Subject: [PATCH 30/40] * Fix the problem of expired login prompt on the login
 page of the newly installed source package.

---
 module/user/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/user/control.php b/module/user/control.php
index 0cb7472c2e..9e4d05f208 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -969,7 +969,7 @@ class user extends control
         }
         else
         {
-            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer));
+            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer) or preg_match("/\/zentaopms\/www\/$/", strtolower($this->referer), $output));
 
             $this->loadModel('misc');
             $this->loadModel('extension');

From 85cecc60e58e995d2c602d59baca258d8420124e Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 8 Jul 2022 01:55:07 +0000
Subject: [PATCH 31/40] * Finish task #59681.

---
 module/task/control.php | 123 +++++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 57 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index aeefa2588c..f317f4a92d 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -539,7 +539,7 @@ class task extends control
 
             if(isonlybody())
             {
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $execution     = $this->execution->getByID($task->execution);
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
@@ -779,7 +779,7 @@ class task extends control
             if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'success'));
             if(isonlybody())
             {
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $task          = $this->task->getById($taskID);
                     $execution     = $this->execution->getByID($task->execution);
@@ -1043,7 +1043,7 @@ class task extends control
 
             if(isonlybody())
             {
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $execution     = $this->execution->getByID($task->execution);
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
@@ -1120,25 +1120,28 @@ class task extends control
 
             if(isonlybody())
             {
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData = json_encode($kanbanData);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1267,7 +1270,7 @@ class task extends control
 
             if(isonlybody())
             {
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $execution     = $this->execution->getByID($task->execution);
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
@@ -1369,7 +1372,7 @@ class task extends control
 
             if(isonlybody())
             {
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $task          = $this->task->getById($taskID);
                     $execution     = $this->execution->getByID($task->execution);
@@ -1440,26 +1443,29 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $task          = $this->task->getById($taskID);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {
@@ -1525,7 +1531,7 @@ class task extends control
                     }
                 }
 
-                if($this->app->tab == 'execution'  or $this->config->vision == 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
@@ -1772,27 +1778,30 @@ class task extends control
 
             if(isonlybody())
             {
-                $task          = $this->task->getById($taskID);
-                $execution     = $this->execution->getByID($task->execution);
-                $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
-                if($execution->type == 'kanban' and ($this->app->tab == 'execution'  or $this->config->vision == 'lite'))
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
-                    $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                    $kanbanData    = json_encode($kanbanData);
+                    $task          = $this->task->getById($taskID);
+                    $execution     = $this->execution->getByID($task->execution);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    if($execution->type == 'kanban')
+                    {
+                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
-                }
-                elseif($execution->type == 'sprint' and $this->app->tab == 'execution')
-                {
-                    $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
-                    $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
-                    $kanbanData = $kanbanData[$kanbanType];
-                    $kanbanData = json_encode($kanbanData);
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
+                    }
+                    else
+                    {
+                        $kanbanData = $this->loadModel('kanban')->getExecutionKanban($task->execution, $execLaneType, $execGroupBy, $rdSearchValue);
+                        $kanbanType = $execLaneType == 'all' ? 'task' : key($kanbanData);
+                        $kanbanData = $kanbanData[$kanbanType];
+                        $kanbanData = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                        return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    }
                 }
                 else
                 {

From b7074c0ec0a6fa6c57e81118435c4f80f0b2e391 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 8 Jul 2022 01:58:21 +0000
Subject: [PATCH 32/40] * Adjust CSS.

---
 module/search/view/buildform.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index b85a370d8c..88114bed01 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -248,7 +248,7 @@ foreach($fieldParams as $fieldName => $param)
         echo html::submitButton($lang->search->common, '', 'btn btn-primary') . " &nbsp; ";
         if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn');
         echo html::commonButton('<i class="icon icon-chevron-double-down"></i>', '', 'btn-expand-form btn btn-info pull-right');
-        if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe pull-right' id='save-query'");
+        if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), '<span class="text"><i class="icon-bug-confirmBug icon-ok"></i> ' . $lang->search->saveCondition . '</span>', '', "class='btn-save-form btn btn-link btn-active-text text iframe' id='save-query'");
         echo html::hidden('formType', zget($formSession, 'formType', 'lite'));
         ?>
       </td>

From f7400480d444efb1ac08c4fbfdef3e808f8e0ddd Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Fri, 8 Jul 2022 02:02:22 +0000
Subject: [PATCH 33/40] fixbug_createTask

---
 module/dept/model.php   | 7 ++++++-
 module/task/control.php | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/dept/model.php b/module/dept/model.php
index 8349d58a4b..1cc5421398 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -113,13 +113,18 @@ class deptModel extends model
         krsort($deptMenu);
         $topMenu = array_pop($deptMenu);
         $topMenu = explode("\n", trim((string)$topMenu));
-        $lastMenu[] = '/' . $this->lang->dept->noDepartment;
+        $lastMenu[] = '/';
         foreach($topMenu as $menu)
         {
             if(!strpos($menu, '|')) continue;
             list($label, $deptID) = explode('|', $menu);
             $lastMenu[$deptID] = $label;
         }
+        if($this->app->tab == 'report')
+        {
+            unset($lastMenu[0]);
+            $lastMenu[] = '/' . $this->lang->dept->noDepartment;
+        }
         return $lastMenu;
     }
 
diff --git a/module/task/control.php b/module/task/control.php
index f9b4f79327..2a7fdddedb 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -44,9 +44,10 @@ class task extends control
         $extra = str_replace(array(',', ' '), array('&', ''), $extra);
         parse_str($extra, $output);
 
-        $execution   = $this->execution->getById($executionID);
-        $executions  = $this->execution->getPairs(0, 'all', !common::canModify('execution', $execution) ? 'noclosed' : '');
+        if(!empty($executionID)) $execution = $this->execution->getById($executionID);
+        $executions  = $this->execution->getPairs(0, 'all', isset($execution) ? (!common::canModify('execution', $execution) ? 'noclosed' : '') : 'noclosed');
         $executionID = $this->execution->saveState($executionID, $executions);
+        $execution = $this->execution->getById($executionID);
         $this->execution->setMenu($executionID);
 
         $this->execution->getLimitedExecution();

From e146c91ecba9049fe51bd1ac6e989e6452e195dd Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 8 Jul 2022 02:04:04 +0000
Subject: [PATCH 34/40] =?UTF-8?q?=EF=BC=8A=20Finish=20task=20#59681.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/task/control.php | 44 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index f317f4a92d..c2806cc53e 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -187,8 +187,8 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                     }
@@ -367,15 +367,15 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                if($thlis->app->tab == 'execution' or $this->config->vision = 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision = 'lite')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
                     }
@@ -1278,9 +1278,9 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                     }
@@ -1381,9 +1381,9 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                     }
@@ -1452,8 +1452,8 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                     }
@@ -1538,9 +1538,9 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                     }
@@ -1716,9 +1716,9 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                     }
@@ -1787,9 +1787,9 @@ class task extends control
                     $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
                     if($execution->type == 'kanban')
                     {
-                        $regionID      = !empty($output['regionID']) ? $output['regionID'] : 0;
-                        $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
-                        $kanbanData    = json_encode($kanbanData);
+                        $regionID   = !empty($output['regionID']) ? $output['regionID'] : 0;
+                        $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy, $rdSearchValue);
+                        $kanbanData = json_encode($kanbanData);
 
                         return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                     }

From 7988466f2f755cc76972b341b25dc008e10adb3a Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 8 Jul 2022 02:07:45 +0000
Subject: [PATCH 35/40] * Finish task #59681.

---
 module/task/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/control.php b/module/task/control.php
index c2806cc53e..4806373e47 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -367,7 +367,7 @@ class task extends control
             /* If link from no head then reload. */
             if(isonlybody())
             {
-                if($this->app->tab == 'execution' or $this->config->vision = 'lite')
+                if($this->app->tab == 'execution' or $this->config->vision == 'lite')
                 {
                     $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy   = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';

From 2c6aeb6c19e6090e727bb1db274958462fc256ec Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 10:15:18 +0800
Subject: [PATCH 36/40] * Fix bug #25014.

---
 module/action/control.php         | 10 ++++++----
 module/action/view/trash.html.php |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 6eec09e57f..f1808d22eb 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -138,10 +138,11 @@ class action extends control
      * Undelete an object.
      *
      * @param  int    $actionID
+     * @param  string $browseType
      * @access public
      * @return void
      */
-    public function undelete($actionID)
+    public function undelete($actionID, $browseType = 'all')
     {
         $oldAction = $this->action->getById($actionID);
         $extra     = $oldAction->extra == ACTIONMODEL::BE_HIDDEN ? 'hidden' : 'all';
@@ -149,7 +150,7 @@ class action extends control
         $this->action->undelete($actionID);
 
         $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, $extra, 'id_desc', null);
-        $browseType      = $sameTypeObjects ? $oldAction->objectType : 'all';
+        $browseType      = ($sameTypeObjects and $browseType != 'all') ? $oldAction->objectType : 'all';
 
         return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType&type=$extra"), 'parent'));
     }
@@ -158,17 +159,18 @@ class action extends control
      * Hide an deleted object.
      *
      * @param  int    $actionID
+     * @param  string $browseType
      * @access public
      * @return void
      */
-    public function hideOne($actionID)
+    public function hideOne($actionID, $browseType = 'all')
     {
         $oldAction = $this->action->getById($actionID);
 
         $this->action->hideOne($actionID);
 
         $sameTypeObjects = $this->action->getTrashes($oldAction->objectType, 'all', 'id_desc', null);
-        $browseType      = $sameTypeObjects ? $oldAction->objectType : 'all';
+        $browseType      = ($sameTypeObjects and $browseType != 'all') ? $oldAction->objectType : 'all';
 
         return print(js::locate($this->createLink('action', 'trash', "browseType=$browseType"), 'parent'));
     }
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index e99797970d..03352675bb 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -139,8 +139,8 @@
           <td><?php echo $action->date;?></td>
           <td>
             <?php
-            common::printLink('action', 'undelete', "actionid=$action->id", $lang->action->undelete, 'hiddenwin');
-            if($type == 'all') common::printLink('action', 'hideOne',  "actionid=$action->id", $lang->action->hideOne, 'hiddenwin');
+            common::printLink('action', 'undelete', "actionid=$action->id&browseType=$currentObjectType", $lang->action->undelete, 'hiddenwin');
+            if($type == 'all') common::printLink('action', 'hideOne',  "actionid=$action->id&browseType=$currentObjectType", $lang->action->hideOne, 'hiddenwin');
             ?>
           </td>
         </tr>

From ed422485ed3fed42dee2fd70342402edfad3c76c Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Fri, 8 Jul 2022 02:31:37 +0000
Subject: [PATCH 37/40] fixbug_report

---
 module/dept/model.php     | 15 +++++++++------
 module/report/control.php |  7 +++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/module/dept/model.php b/module/dept/model.php
index 1cc5421398..d50338310a 100644
--- a/module/dept/model.php
+++ b/module/dept/model.php
@@ -113,18 +113,21 @@ class deptModel extends model
         krsort($deptMenu);
         $topMenu = array_pop($deptMenu);
         $topMenu = explode("\n", trim((string)$topMenu));
-        $lastMenu[] = '/';
+        if($this->app->tab == 'report')
+        {
+            $lastMenu[] = '/' . $this->lang->dept->noDepartment;
+        }
+        else
+        {
+            $lastMenu[] = '/';
+        }
         foreach($topMenu as $menu)
         {
             if(!strpos($menu, '|')) continue;
             list($label, $deptID) = explode('|', $menu);
             $lastMenu[$deptID] = $label;
         }
-        if($this->app->tab == 'report')
-        {
-            unset($lastMenu[0]);
-            $lastMenu[] = '/' . $this->lang->dept->noDepartment;
-        }
+
         return $lastMenu;
     }
 
diff --git a/module/report/control.php b/module/report/control.php
index 15d582fa4f..71b38ffc84 100644
--- a/module/report/control.php
+++ b/module/report/control.php
@@ -315,6 +315,13 @@ class report extends control
         $users[''] = $this->lang->report->annualData->allUser;
 
         $depts = $this->loadModel('dept')->getOptionMenu();
+        if($this->app->tab == 'report')
+        {
+            $noDepartment = $depts[0];
+            unset($depts[0]);
+            $depts += array('0' => $noDepartment);
+        }
+
         $accounts = array();
         if($userID)
         {

From fe4b40e3cd03a56614d60e00001508d3abee29b6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 10:34:05 +0800
Subject: [PATCH 38/40] * Fix bug #24127.

---
 module/task/view/edit.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 7ed8075bd5..73e09a8178 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -262,7 +262,7 @@
     <div class="modal fade modal-team" id="modalTeam"  data-scroll-inside='false'>
       <div class="modal-dialog">
         <div class="modal-header">
-          <button type="button" class="close hidden" data-dismiss="modal">
+          <button type="button" class="close" data-dismiss="modal">
             <i class="icon icon-close"></i>
           </button>
           <h4 class="modal-title"><?php echo $lang->task->team?></h4>

From d2b201003bb8be400d0efebbfa29fd85b0be4f6b Mon Sep 17 00:00:00 2001
From: sunjun <sunjun@easycorp.ltd>
Date: Fri, 8 Jul 2022 02:37:29 +0000
Subject: [PATCH 39/40] fixbug

---
 module/task/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/task/control.php b/module/task/control.php
index 2a7fdddedb..f0b8fe1ac7 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -47,7 +47,7 @@ class task extends control
         if(!empty($executionID)) $execution = $this->execution->getById($executionID);
         $executions  = $this->execution->getPairs(0, 'all', isset($execution) ? (!common::canModify('execution', $execution) ? 'noclosed' : '') : 'noclosed');
         $executionID = $this->execution->saveState($executionID, $executions);
-        $execution = $this->execution->getById($executionID);
+        $execution   = $this->execution->getById($executionID);
         $this->execution->setMenu($executionID);
 
         $this->execution->getLimitedExecution();

From c4e930ce49697adc8d98881eef6da3b6a32bc26c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 10:41:23 +0800
Subject: [PATCH 40/40] * Fix the problem of expired login prompt on the login
 page of the newly installed source package.

---
 module/user/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/user/control.php b/module/user/control.php
index 9e4d05f208..522fd03042 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -969,7 +969,7 @@ class user extends control
         }
         else
         {
-            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer) or preg_match("/\/zentaopms\/www\/$/", strtolower($this->referer), $output));
+            $loginExpired = !(preg_match("/(m=|\/)(index)(&f=|-)(index)(&|-|\.)?/", strtolower($this->referer), $output) or $this->referer == $this->config->webRoot or empty($this->referer) or preg_match("/\/www\/$/", strtolower($this->referer), $output));
 
             $this->loadModel('misc');
             $this->loadModel('extension');