From 55f6cdb651520d1d5b707f029ab0e4d0081ed6b4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Jun 2022 15:53:37 +0800
Subject: [PATCH 01/22] * Finish task #56548.

---
 module/execution/control.php              |  8 ++++++++
 module/execution/js/importtask.js         | 19 +++++++++++++++++++
 module/execution/view/importtask.html.php |  8 ++++++++
 module/execution/view/kanban.html.php     |  4 +++-
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index e89d613e03..56a85eadd3 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -458,6 +458,14 @@ class execution extends control
         if(!empty($_POST))
         {
             $this->execution->importTask($toExecution);
+
+            /* If link from no head then reload. */
+            if(isonlybody())
+            {
+                $kanbanData = $this->loadModel('kanban')->getRDKanban($toExecution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                return print(js::reload('parent'));
+            }
+
             return print(js::locate(inlink('importTask', "toExecution=$toExecution&fromExecution=$fromExecution"), 'parent'));
         }
 
diff --git a/module/execution/js/importtask.js b/module/execution/js/importtask.js
index 47b2dca33d..015260e808 100644
--- a/module/execution/js/importtask.js
+++ b/module/execution/js/importtask.js
@@ -3,3 +3,22 @@ function reload(toProject, fromProject)
     link = createLink('execution','importtask','toProject='+toProject + '&fromProject='+fromProject);
     location.href = link;
 }
+
+$(function()
+{
+    $(".preview").modalTrigger({width:1000, type:'iframe'});
+
+    if(isonlybody == true) parent.$('#triggerModal .modal-content .modal-header .close').hide();
+});
+
+
+/**
+ * Go back.
+ *
+ * @access public
+ * @return void
+ */
+function goback()
+{
+    parent.location.reload();
+}
diff --git a/module/execution/view/importtask.html.php b/module/execution/view/importtask.html.php
index e03a6f48d7..d56e1131ba 100644
--- a/module/execution/view/importtask.html.php
+++ b/module/execution/view/importtask.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php js::set('isonlybody', isonlybody());?>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-left btn-toolbar'>
     <?php echo html::a($this->createLink('execution', 'importTask', "execution=$executionID"), "<span class='text'>{$lang->execution->importTask}</span>", '', "class='btn btn-link btn-active-text'");?>
@@ -83,6 +84,13 @@
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always"><?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->execution->importTask, '', 'btn btn-secondary btn-wide');?></div>
+      <div class='btn-toolbar'>
+        <?php if(isonlybody()):?>
+        <?php echo html::commonButton('<i class="icon icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
+        <?php else:?>
+        <?php echo html::backButton('','','btn');?>
+        <?php endif;?>
+      </div>
     </div>
     <?php endif;?>
   </form>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 81d1ddb848..5b97b0776a 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -62,6 +62,7 @@ $canBatchCreateTask  = common::hasPriv('task', 'batchCreate');
 $canCreateBug        = ($productID and common::hasPriv('bug', 'create'));
 $canBatchCreateBug   = ($productID and common::hasPriv('bug', 'batchCreate'));
 $canImportBug        = ($productID and common::hasPriv('execution', 'importBug'));
+$canImportTask       = ($productID and common::hasPriv('execution', 'importTask'));
 $canCreateStory      = ($productID and common::hasPriv('story', 'create'));
 $canBatchCreateStory = ($productID and common::hasPriv('story', 'batchCreate'));
 $canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory'));
@@ -198,7 +199,8 @@ js::set('hasTaskButton', $hasTaskButton);
         }?>
         <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
-        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width=80%") . '</li>';?>
+        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width=90%") . '</li>';?>
+        <?php if($canImportTask) echo '<li>' . html::a(helper::createLink('execution', 'importTask', "executionID=$execution->id", '', true), $lang->execution->importTask, '', "class='iframe' data-width=90%") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '</li>';?>
       </ul>
     </div>

From 326323a0c1a0b898540982b6e9fc6a5d74395d90 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Jun 2022 09:11:54 +0800
Subject: [PATCH 02/22] * Modify url param.

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

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 5b97b0776a..64190244e1 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -200,7 +200,7 @@ js::set('hasTaskButton', $hasTaskButton);
         <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
         <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width=90%") . '</li>';?>
-        <?php if($canImportTask) echo '<li>' . html::a(helper::createLink('execution', 'importTask', "executionID=$execution->id", '', true), $lang->execution->importTask, '', "class='iframe' data-width=90%") . '</li>';?>
+        <?php if($canImportTask) echo '<li>' . html::a(helper::createLink('execution', 'importTask', "toExecution=$execution->id", '', true), $lang->execution->importTask, '', "class='iframe' data-width=90%") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '</li>';?>
       </ul>
     </div>

From 35a857fd38f024760c649772930fc3aec4855168 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 9 Jun 2022 10:33:39 +0800
Subject: [PATCH 03/22] * Adjust code.

---
 module/execution/js/importtask.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/execution/js/importtask.js b/module/execution/js/importtask.js
index 015260e808..f3626b5617 100644
--- a/module/execution/js/importtask.js
+++ b/module/execution/js/importtask.js
@@ -11,7 +11,6 @@ $(function()
     if(isonlybody == true) parent.$('#triggerModal .modal-content .modal-header .close').hide();
 });
 
-
 /**
  * Go back.
  *

From ea746e862f61c34195a29d21cf91dbc16c368c6c Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 9 Jun 2022 03:04:12 +0000
Subject: [PATCH 04/22] * Finish task #56362.

---
 module/execution/js/kanban.js             | 32 ++++++++++++++++++++---
 module/execution/js/taskkanban.js         | 32 ++++++++++++++++++++---
 module/execution/view/kanban.html.php     |  1 +
 module/execution/view/taskkanban.html.php |  1 +
 module/kanban/model.php                   | 14 +++++-----
 5 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 5c143b7fc3..e5e802fe54 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -457,6 +457,32 @@ function renderDeadline(deadline, status)
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
 }
 
+/**
+ * Render estStarted
+ *
+ * @param  {String|Date} estStarted EstStarted
+ * @param  {string}      status
+ * @access public
+ * @return void
+ */
+function renderEstStarted(estStarted, status)
+{
+    if(estStarted == '0000-00-00') return;
+
+    var date = $.zui.createDate(estStarted);
+    var now  = new Date();
+    now.setHours(0);
+    now.setMinutes(0);
+    now.setSeconds(0);
+    now.setMilliseconds(0);
+    var isEarlyThanToday = date.getTime() < now.getTime();
+    var estStartedDate   = $.zui.formatDate(date, 'MM-dd');
+    var statusList       = ['wait','doing','pause'];
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
+
+    return $('<span class="info info-deadline"/>').text(estStartedLang + ' ' + estStartedDate).addClass(textColor);
+}
+
 /**
  * Render story item
  * @param {Object} item  Story item object
@@ -606,8 +632,7 @@ function renderTaskItem(item, $item, col)
         var $title = $item.find('.title');
         if(!$title.length)
         {
-            $title = $('<a class="title iframe" data-width="95%">' + (scaleSize <= 1 ? '<i class="icon icon-checked text-muted"></i> ' : '') + '<span class="text"></span></a>')
-                    .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%');
+            $title = $('<a class="title iframe" data-width="95%">' + (scaleSize <= 1 ? '<i class="icon icon-checked text-muted"></i> ' : '') + '<span class="text"></span></a>').attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true)).attr('data-toggle', 'modal').attr('data-width', '80%');
             $title.appendTo($item);
         }
         var name = rdSearchValue != '' ? "<span class='text'>" + item.name.replaceAll(rdSearchValue, "<span class='text-danger'>" + rdSearchValue + "</span>") + "</span>": "<span class='text'>" + item.name + "</span>";
@@ -623,7 +648,8 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
         if(scaleSize <= 1) $infos.appendTo($item);
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index f59eac1f7b..f99195330a 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -73,6 +73,32 @@ function renderDeadline(deadline, status)
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
 }
 
+/**
+ * Render estStarted
+ *
+ * @param  {String|Date} estStarted EstStarted
+ * @param  {string}      status
+ * @access public
+ * @return void
+ */
+function renderEstStarted(estStarted, status)
+{
+    if(estStarted == '0000-00-00') return;
+
+    var date = $.zui.createDate(estStarted);
+    var now  = new Date();
+    now.setHours(0);
+    now.setMinutes(0);
+    now.setSeconds(0);
+    now.setMilliseconds(0);
+    var isEarlyThanToday = date.getTime() < now.getTime();
+    var estStartedDate   = $.zui.formatDate(date, 'MM-dd');
+    var statusList       = ['wait','doing','pause'];
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
+
+    return $('<span class="info info-deadline"/>').text(estStartedLang + ' ' + estStartedDate).addClass(textColor);
+}
+
 /**
  * Render story item
  * @param {Object} item  Story item object
@@ -218,8 +244,7 @@ function renderTaskItem(item, $item, col)
         var $title = $item.find('.title');
         if(!$title.length)
         {
-            $title = $('<a class="title iframe" data-width="95%">' + (scaleSize <= 1 ? '<i class="icon icon-checked text-muted"></i> ' : '') + '<span class="text"></span></a>')
-                    .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true));
+            $title = $('<a class="title iframe" data-width="95%">' + (scaleSize <= 1 ? '<i class="icon icon-checked text-muted"></i> ' : '') + '<span class="text"></span></a>').attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true));
             $title.appendTo($item);
         }
         $title.attr('title', item.name).find('.text').text(item.name);
@@ -234,7 +259,8 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
         if(scaleSize <= 1) $infos.appendTo($item);
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index a1c1615e0a..c4b14adc91 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -52,6 +52,7 @@ js::set('vision', $this->config->vision);
 js::set('productCount', count($productNames));
 js::set('executionID', $execution->id);
 js::set('reviewStoryParis', $reviewStoryParis);
+js::set('estStartedLang', $lang->task->estStarted);
 js::set('rdSearchValue', '');
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 7ec69b0041..5812853dd6 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -213,4 +213,5 @@ js::set('priv',
 <?php js::set('fluidBoard', $execution->fluidBoard);?>
 <?php js::set('displayCards', $execution->displayCards);?>
 <?php js::set('reviewStoryParis', $reviewStoryParis);?>
+<?php js::set('estStartedLang', $lang->task->estStarted);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 1ec2c65282..d12387ac96 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1304,9 +1304,10 @@ class kanbanModel extends model
                     if($cell->type == 'task')
                     {
                         if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
-                        $cardData['name']     = $object->name;
-                        $cardData['status']   = $object->status;
-                        $cardData['left']     = $object->left;
+                        $cardData['name']       = $object->name;
+                        $cardData['status']     = $object->status;
+                        $cardData['left']       = $object->left;
+                        $cardData['estStarted'] = $object->estStarted;
                     }
                     else
                     {
@@ -1415,9 +1416,10 @@ class kanbanModel extends model
                     if($lane->type == 'task')
                     {
                         if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
-                        $cardData['name']   = $object->name;
-                        $cardData['status'] = $object->status;
-                        $cardData['left']   = $object->left;
+                        $cardData['name']       = $object->name;
+                        $cardData['status']     = $object->status;
+                        $cardData['left']       = $object->left;
+                        $cardData['estStarted'] = $object->estStarted;
                     }
                     else
                     {

From acf028e0a9fb17b905cfebf62a01f642daf8ec51 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 9 Jun 2022 03:24:15 +0000
Subject: [PATCH 05/22] * Fix bug.

---
 module/execution/js/kanban.js | 2 +-
 module/kanban/css/space.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 26ecb547fd..05fbb28851 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -740,7 +740,7 @@ function renderHeaderCol($column, column, $header, kanbanData)
     var printMoreBtn = (columnPrivs.includes('setColumn') || columnPrivs.includes('setWIP'));
 
     /* Render more menu. */
-    if(column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed'  && $actions.children('.text-primary').length == 0)
+    if((column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed') && $actions.children('.text-primary').length == 0)
     {
         var tips = productID ? '' : 'onclick="tips()"';
         $actions.append([
diff --git a/module/kanban/css/space.css b/module/kanban/css/space.css
index fdda9edfc4..81caf15045 100644
--- a/module/kanban/css/space.css
+++ b/module/kanban/css/space.css
@@ -7,7 +7,7 @@
 #spaceList .spaceActions > a{margin-left: 10px;}
 .space .menu {margin-left: 5px; margin-right:5px;}
 .space .table-empty-tip {padding: 40px 10px;}
-.space .spaceTitle.pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)}
+.space .spaceTitle .pull-left {overflow: hidden; white-space: nowrap; max-width: calc(100% - 255px)}
 .spaceName {font-size: 16px; font-weight: bold;}
 .spaceTitle .icon-cube {font-size: 16px;}
 .spaceDesc {font-size: 13px; color: #838A9D; margin: -5px 0 5px 18px;}

From 3c78c49df0412819fd76471e0b54395cd1e2a936 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 11:30:35 +0800
Subject: [PATCH 06/22] * Fix bug for lite kanban.

---
 extension/lite/kanban/ext/model/lite.php      |  6 ++++-
 .../lite/project/ext/view/execution.html.php  | 26 +++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php
index 3406eb1c33..7d0f5b2288 100644
--- a/extension/lite/kanban/ext/model/lite.php
+++ b/extension/lite/kanban/ext/model/lite.php
@@ -85,7 +85,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu
             $columnData[$columnID]['actions']    = $column->actions;
 
             $cardOrder = 1;
-            $objects   = zget($cardGroup, $columnID, array());
+            $objects   = zget($cardGroup, $column->columnType, array());
             foreach($objects as $object)
             {
                 if(empty($object)) continue;
@@ -104,10 +104,14 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu
 
                 if($browseType == 'task')
                 {
+                    if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
                     $cardData['name'] = $object->name;
+                    $cardData['status'] = $object->status;
+                    $cardData['left']   = $object->left;
                 }
                 else
                 {
+                    if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
                     $cardData['title'] = $object->title;
                 }
 
diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php
index b9fc5931c4..fc569b5f0d 100644
--- a/extension/lite/project/ext/view/execution.html.php
+++ b/extension/lite/project/ext/view/execution.html.php
@@ -37,17 +37,17 @@
   </div>
   <?php else:?>
     <div class='kanban-cards'>
-      <?php 
+      <?php
         $kanbanview = 'kanban';
         if($this->cookie->kanbanview) $kanbanview = $this->cookie->kanbanview;
-        
+
         if(!common::hasPriv('execution', $kanbanview))
         {
-            foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view) 
+            foreach (explode('|', 'kanban|task|calendar|gantt|tree|grouptask') as $view)
             {
                 if(common::hasPriv('execution', $view))
                 {
-                    $kanbanview = $view; 
+                    $kanbanview = $view;
                     break;
                 }
             }
@@ -93,24 +93,24 @@
               </div>
               <div class="kanban-footer">
                 <div class='kanban-members pull-left'>
-                  <?php $teams = $memberGroup[$kanban->id];?>
+                  <?php $teams = isset($memberGroup[$kanban->id]) ? $memberGroup[$kanban->id] : array();?>
                   <?php $count = 0;?>
                   <?php foreach($teams as $member):?>
-                  <?php if($count > 2) break;?>   
-                  <?php $count ++;?>       
+                  <?php if($count > 2) break;?>
+                  <?php $count ++;?>
                   <div title="<?php echo zget($users, $member->account);?>">
                     <?php echo html::smallAvatar(array('avatar' => zget($usersAvatar, $member->account), 'account' => $member->account, 'name' => isset($member->realname) ? $member->realname : '')); ?>
                   </div>
                   <?php endforeach;?>
                   <?php if(count($teams) > 4):?>
-                  <?php echo '<span>… </span>';?> 
-                  <?php endif;?> 
+                  <?php echo '<span>… </span>';?>
+                  <?php endif;?>
                   <?php if(count($teams) > 3):?>
                   <?php $lastMember = end($teams);?>
-                  <div title="<?php echo $lastMember->realname;?>"> 
-                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?>     
-                  </div>         
-                  <?php endif;?> 
+                  <div title="<?php echo $lastMember->realname;?>">
+                  <?php echo html::smallAvatar(array('avatar' => $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?>
+                  </div>
+                  <?php endif;?>
                 </div>
                 <div class='kanban-members-count pull-left'><?php echo sprintf($lang->project->teamSumCount, count($teams));?></div>
                 <div class='kanban-acl pull-right'>

From 38a7d7334ab0fee1a2b9c0b50024bf939bce31c2 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 9 Jun 2022 03:42:53 +0000
Subject: [PATCH 07/22] * Fix bug#23481,bug#23466.

---
 module/execution/control.php | 5 ++++-
 module/kanban/control.php    | 2 +-
 module/kanban/css/view.css   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index ac8760f403..4bf8a363ec 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -115,6 +115,7 @@ class execution extends control
         $this->loadModel('datatable');
         $this->loadModel('setting');
         $this->loadModel('product');
+        $this->loadModel('user');
 
         if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
 
@@ -211,6 +212,7 @@ class execution extends control
         /* team member pairs. */
         $memberPairs = array();
         foreach($this->view->teamMembers as $key => $member) $memberPairs[$key] = $member->realname;
+        $memberPairs = $this->user->processAccountSort($memberPairs);
 
         $showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
         $extra         = (isset($this->config->execution->task->allModule) && $this->config->execution->task->allModule == 1) ? 'allModule' : '';
@@ -227,7 +229,7 @@ class execution extends control
         $this->view->orderBy      = $orderBy;
         $this->view->browseType   = $browseType;
         $this->view->status       = $status;
-        $this->view->users        = $this->loadModel('user')->getPairs('noletter|all');
+        $this->view->users        = $this->user->getPairs('noletter|all');
         $this->view->param        = $param;
         $this->view->executionID  = $executionID;
         $this->view->execution    = $execution;
@@ -918,6 +920,7 @@ class execution extends control
         {
             $memberPairs[$key] = $member->realname;
         }
+        $memberPairs = $this->user->processAccountSort($memberPairs);
 
         /* Build the search form. */
         $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 1b83d01bfb..262ce042da 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1606,7 +1606,7 @@ class kanban extends control
 
         $this->view->canEdit = $from == 'RDKanban' ? 0 : 1;
         $this->view->column  = $column;
-        $this->view->title   = $column->name . $this->lang->colon . $this->lang->kanban->setColumn;
+        $this->view->title   = $column->name . $this->lang->colon . $this->lang->kanban->editColumn;
         $this->display();
     }
 
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 7d955d6ea4..9f917732a3 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -140,3 +140,4 @@
 #main > .container {padding: 0px 0px 0px 10px; margin: -10px 0px 0px 0px;}
 @media screen and (max-width: 1366px){#main > .container {padding: 0px 10px 0px 10px; margin: -10px 0px 0px 0px;}}
 .panel-body {padding: 0px;}
+#kanbanContainer {background: #efefef; box-shadow: none;}

From 89d4ecfd355140ad97a5572fe98cb9d01d1e704e Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 9 Jun 2022 03:43:20 +0000
Subject: [PATCH 08/22] * Finish task #56362.

---
 module/execution/js/kanban.js     | 7 +++----
 module/execution/js/taskkanban.js | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index e5e802fe54..f331c9f8e0 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -451,7 +451,7 @@ function renderDeadline(deadline, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['wait','doing','pause'];
+    var statusList       = ['doing','done','pause'];
     var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
@@ -477,8 +477,7 @@ function renderEstStarted(estStarted, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var estStartedDate   = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['wait','doing','pause'];
-    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && status =='wait' ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(estStartedLang + ' ' + estStartedDate).addClass(textColor);
 }
@@ -648,7 +647,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause' || item.status == 'done')) $infos.append(renderDeadline(item.deadline, item.status));
         if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index f99195330a..6184835039 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -67,7 +67,7 @@ function renderDeadline(deadline, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['wait','doing','pause'];
+    var statusList       = ['doing','done','pause'];
     var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
@@ -93,8 +93,7 @@ function renderEstStarted(estStarted, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var estStartedDate   = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['wait','doing','pause'];
-    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && status == 'wait' ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(estStartedLang + ' ' + estStartedDate).addClass(textColor);
 }
@@ -259,7 +258,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause' || item.status == 'done')) $infos.append(renderDeadline(item.deadline, item.status));
         if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 

From a71825d731611b2ec7207561cba28bfb55df38b1 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 9 Jun 2022 05:08:33 +0000
Subject: [PATCH 09/22] * Fix bug.

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

diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index b86967cac7..8ede245caf 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -72,7 +72,7 @@
         <div class='col' data-id='<?php echo $kanbanID?>'>
           <div class='panel' data-url='<?php echo $this->createLink('kanban', 'view', "kanbanID=$kanbanID");?>'>
             <div class='panel-heading'>
-              <?php if($kanban->space == 2 and $kanban->owner == $this->app->user->account):?>
+              <?php if($browseType == 'cooperation' and $kanban->owner == $this->app->user->account):?>
               <span class="label label-outline label-info kanban-label"><?php echo $lang->kanban->mine;?></span>
               <?php endif;?>
               <div class='kanban-name'>

From c056b7e567608bebd025b3e02bd6c519dbaaaf8c Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 9 Jun 2022 05:18:27 +0000
Subject: [PATCH 10/22] * Finish task #56461,56462,56458,56465.

---
 module/bug/lang/en.php        |   1 +
 module/bug/lang/zh-cn.php     |   1 +
 module/bug/model.php          |  52 ++++++++++-
 module/execution/config.php   |   2 +
 module/my/control.php         |  25 ++++--
 module/my/lang/en.php         |   1 +
 module/my/lang/zh-cn.php      |   1 +
 module/my/model.php           | 164 ++++++++++++++++++++++++++++++++++
 module/my/view/bug.html.php   |  10 ++-
 module/my/view/task.html.php  |  25 ++++--
 module/project/lang/en.php    |   1 +
 module/project/lang/zh-cn.php |   1 +
 12 files changed, 266 insertions(+), 18 deletions(-)

diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index b1cba31e03..8c1957c244 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -61,6 +61,7 @@ $lang->bug->openedDate       = 'ReportedDate';
 $lang->bug->openedDateAB     = 'Reported';
 $lang->bug->openedBuild      = 'Open Build';
 $lang->bug->assignedTo       = 'AssignTo';
+$lang->bug->assignedToMe     = 'AssignToMe';
 $lang->bug->assignBug        = 'AssignedTo';
 $lang->bug->assignedToAB     = 'AssignedTo';
 $lang->bug->assignedDate     = 'AssignedDate';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index c77c47c11f..52d5277a7c 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -61,6 +61,7 @@ $lang->bug->openedDate       = '创建日期';
 $lang->bug->openedDateAB     = '创建日期';
 $lang->bug->openedBuild      = '影响版本';
 $lang->bug->assignedTo       = '指派给';
+$lang->bug->assignedToMe     = '指派给我';
 $lang->bug->assignBug        = '指派给';
 $lang->bug->assignedToAB     = '指派给';
 $lang->bug->assignedDate     = '指派日期';
diff --git a/module/bug/model.php b/module/bug/model.php
index 723d90e267..59a3ce2bae 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -1601,18 +1601,62 @@ class bugModel extends model
      * @param  int    $limit
      * @param  object $pager
      * @param  int    $executionID
+     * @param  int    $queryID
      * @access public
-     * @return void
+     * @return array
      */
-    public function getUserBugs($account, $type = 'assignedTo', $orderBy = 'id_desc', $limit = 0, $pager = null, $executionID = 0)
+    public function getUserBugs($account, $type = 'assignedTo', $orderBy = 'id_desc', $limit = 0, $pager = null, $executionID = 0, $queryID = 0)
     {
-        if(!$this->loadModel('common')->checkField(TABLE_BUG, $type)) return array();
+        $moduleName = $this->app->rawMethod == 'work' ? 'workBug' : 'contributeBug';
+        $queryName  = $moduleName . 'Query';
+        $formName   = $moduleName . 'Form';
+
+        $bugIDList = array();
+        if($moduleName == 'contributeBug')
+        {
+            $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, $pager, $orderBy, 0, 'bug');
+            foreach($bugsAssignedByMe as $bugID => $bug)
+            {
+                $bugIDList[$bugID] = $bugID;
+            }
+        }
+
+        if($queryID)
+        {
+            $query = $this->loadModel('search')->getQuery($queryID);
+            if($query)
+            {
+                $this->session->set($queryName, $query->sql);
+                $this->session->set($formName, $query->form);
+            }
+            else
+            {
+                $this->session->set($queryName, ' 1 = 1');
+            }
+        }
+        else
+        {
+            if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1');
+        }
+        $query = $this->session->$queryName;
+        $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
+
+        if($type != 'bySearch' and !$this->loadModel('common')->checkField(TABLE_BUG, $type)) return array();
         $bugs = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_BUG)->alias('t1')
             ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
             ->where('t1.deleted')->eq(0)
+            ->beginIF($type == 'bySearch')->andWhere($query)->fi()
             ->beginIF($executionID)->andWhere('t1.execution')->eq($executionID)->fi()
             ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi()
-            ->beginIF($type != 'all')->andWhere("t1.`$type`")->eq($account)->fi()
+            ->beginIF($type != 'all' and $type != 'bySearch')->andWhere("t1.`$type`")->eq($account)->fi()
+            ->beginIF($type == 'bySearch' and $moduleName == 'workBug')->andWhere("t1.assignedTo")->eq($account)->fi()
+            ->beginIF($type == 'bySearch' and $moduleName == 'contributeBug')
+            ->andWhere('t1.openedBy', 1)->eq($account)
+            ->orWhere('t1.closedBy')->eq($account)
+            ->orWhere('t1.resolvedBy')->eq($account)
+            ->orWhere('t1.id')->in($bugIDList)
+            ->markRight(1)
+            ->fi()
             ->orderBy($orderBy)
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->page($pager)
diff --git a/module/execution/config.php b/module/execution/config.php
index fb00ff4e8f..6467b32538 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -51,6 +51,7 @@ $config->execution->search['fields']['desc']           = $lang->task->desc;
 $config->execution->search['fields']['assignedTo']     = $lang->task->assignedTo;
 $config->execution->search['fields']['pri']            = $lang->task->pri;
 
+if($app->tab == 'my') $config->execution->search['fields']['project'] = $lang->task->project;
 $config->execution->search['fields']['execution']      = $lang->task->execution;
 $config->execution->search['fields']['module']         = $lang->task->module;
 $config->execution->search['fields']['estimate']       = $lang->task->estimate;
@@ -86,6 +87,7 @@ $config->execution->search['params']['desc']           = array('operator' => 'in
 $config->execution->search['params']['assignedTo']     = array('operator' => '=',       'control' => 'select', 'values' => 'users');
 $config->execution->search['params']['pri']            = array('operator' => '=',       'control' => 'select', 'values' => $lang->task->priList);
 
+if($app->tab == 'my') $config->execution->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => '');
 $config->execution->search['params']['execution']      = array('operator' => '=',       'control' => 'select', 'values' => '');
 $config->execution->search['params']['module']         = array('operator' => 'belong',  'control' => 'select', 'values' => '');
 $config->execution->search['params']['estimate']       = array('operator' => '=',       'control' => 'input',  'values' => '');
diff --git a/module/my/control.php b/module/my/control.php
index 428f26c3eb..5c4b1c29fa 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -411,9 +411,12 @@ EOF;
      * @access public
      * @return void
      */
-    public function task($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function task($type = 'assignedTo', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->loadModel('task');
+        $this->loadModel('execution');
+        $queryID  = ($type == 'bySearch') ? (int)$param : 0;
+
         /* Save session. */
         if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
 
@@ -430,9 +433,13 @@ EOF;
         {
             $tasks = $this->my->getAssignedByMe($this->app->user->account, 0, $pager, $sort, 0, 'task');
         }
+        elseif($type == 'bySearch')
+        {
+            $tasks = $this->my->getTasksBySearch($this->app->user->account, 0, $pager, $sort, $queryID);
+        }
         else
         {
-            $tasks = $this->task->getUserTasks($this->app->user->account, $type, 0, $pager, $sort);
+            $tasks = $this->task->getUserTasks($this->app->user->account, $type, 0, $pager, $sort, $queryID);
         }
 
         $parents         = array();
@@ -473,6 +480,9 @@ EOF;
         /* Get the story language configuration. */
         $this->app->loadLang('story');
 
+        $actionURL = $this->createLink('my', $this->app->rawMethod, "mode=task&browseType=bySearch&queryID=myQueryID");
+        $this->my->buildTaskSearchForm($queryID, $actionURL);
+
         /* Assign. */
         $this->view->title      = $this->lang->my->common . $this->lang->colon . $this->lang->my->task;
         $this->view->position[] = $this->lang->my->task;
@@ -505,12 +515,13 @@ EOF;
      * @access public
      * @return void
      */
-    public function bug($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function bug($type = 'assignedTo', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. load Lang. */
         $this->loadModel('bug');
-        if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
         $this->app->loadLang('bug');
+        $queryID  = ($type == 'bySearch') ? (int)$param : 0;
+        if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -525,12 +536,16 @@ EOF;
         }
         else
         {
-            $bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager);
+            $bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager, '', $queryID);
         }
 
         $bugs = $this->bug->checkDelayedBugs($bugs);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
 
+
+        $actionURL = $this->createLink('my', $this->app->rawMethod, "mode=bug&browseType=bySearch&queryID=myQueryID");
+        $this->my->buildBugSearchForm($queryID, $actionURL);
+
         /* assign. */
         $this->view->title       = $this->lang->my->common . $this->lang->colon . $this->lang->my->bug;
         $this->view->position[]  = $this->lang->my->bug;
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 5aa236aa2a..5ea1688567 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -44,6 +44,7 @@ $lang->my->storyConcept    = 'Story Concept';
 $lang->my->pri             = 'Priority';
 $lang->my->alert           = 'You can click on your profile at the top right and select "Preference" to modify your information. ';
 $lang->my->assignedToMe    = 'AssignedToMe';
+$lang->my->byQuery         = 'Search';
 
 $lang->my->indexAction      = 'My Index';
 $lang->my->calendarAction   = 'My Calendar';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 265f0899b7..b1c3471f89 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -44,6 +44,7 @@ $lang->my->storyConcept    = $config->URAndSR ? '默认需求概念组合' : '
 $lang->my->pri             = '优先级';
 $lang->my->alert           = '后续您可以点击右上方的头像，选择“个性化设置”修改信息。';
 $lang->my->assignedToMe    = '指派给我';
+$lang->my->byQuery         = '搜索';
 
 $lang->my->indexAction      = '地盘仪表盘';
 $lang->my->calendarAction   = '我的日程';
diff --git a/module/my/model.php b/module/my/model.php
index b36f80cd30..c7181096c3 100644
--- a/module/my/model.php
+++ b/module/my/model.php
@@ -458,4 +458,168 @@ class myModel extends model
         }
         return $cases;
     }
+
+    /**
+     * Build search form for task page of work.
+     *
+     * @param  int    $queryID
+     * @param  string $actionURL
+     * @access public
+     * @return void
+     */
+    public function buildTaskSearchForm($queryID, $actionURL)
+    {
+        $rawMethod = $this->app->rawMethod;
+        $this->loadModel('execution');
+        $this->app->loadConfig('execution');
+
+        $this->config->execution->search['module']    = $rawMethod . 'Task';
+        $this->config->execution->search['actionURL'] = $actionURL;
+        $this->config->execution->search['queryID']   = $queryID;
+
+        if($rawMethod == 'work')
+        {
+            unset($this->config->execution->search['fields']['closedReason']);
+            unset($this->config->execution->search['fields']['closedBy']);
+            unset($this->config->execution->search['fields']['canceledBy']);
+            unset($this->config->execution->search['fields']['closedDate']);
+            unset($this->config->execution->search['fields']['canceledDate']);
+        }
+
+        $projects = $this->loadModel('project')->getPairsByProgram();
+        $this->config->execution->search['params']['project']['values'] = $projects + array('all' => $this->lang->project->allProjects);
+
+        $executions = $this->execution->getPairs();
+        $this->config->execution->search['params']['execution']['values'] = $executions + array('all' => $this->lang->execution->allExecutions);
+
+        $this->config->execution->search['params']['module']['values'] = $this->loadModel('tree')->getAllModulePairs();
+
+        $this->loadModel('search')->setSearchParams($this->config->execution->search);
+    }
+
+    /**
+     * Get tasks by search.
+     *
+     * @param  string $account
+     * @param  int    $limit
+     * @param  object $pager
+     * @param  string $orderBy
+     * @param  int    $queryID
+     * @access public
+     * @return array
+     */
+    public function getTasksBySearch($account, $limit = 0, $pager = null, $orderBy = 'id_desc', $queryID = 0)
+    {
+        $moduleName = $this->app->rawMethod == 'work' ? 'workTask' : 'contributeTask';
+        $queryName  = $moduleName . 'Query';
+        $formName   = $moduleName . 'Form';
+
+        $taskIDList = array();
+        if($moduleName == 'contributeTask')
+        {
+            $tasksAssignedByMe = $this->getAssignedByMe($account, 0, $pager, $orderBy, 0, 'task');
+            foreach($tasksAssignedByMe as $taskID => $task)
+            {
+                $taskIDList[$taskID] = $taskID;
+            }
+        }
+
+        if($queryID)
+        {
+            $query = $this->loadModel('search')->getQuery($queryID);
+            if($query)
+            {
+                $this->session->set($queryName, $query->sql);
+                $this->session->set($formName, $query->form);
+            }
+            else
+            {
+                $this->session->set($queryName, ' 1 = 1');
+            }
+        }
+        else
+        {
+            if($this->session->$queryName == false) $this->session->set($queryName, ' 1 = 1');
+        }
+
+        $query = $this->session->$queryName;
+
+        $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
+        $query = str_replace('t1.`project`', 't2.`project`', $query);
+
+        $tasks = $this->dao->select('t1.*, t2.id as executionID, t2.name as executionName, t2.type as executionType, t3.id as storyID, t3.title as storyTitle, t3.status AS storyStatus, t3.version AS latestStoryVersion')
+            ->from(TABLE_TASK)->alias('t1')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on("t1.execution = t2.id")
+            ->leftJoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on("t1.project = t4.id")
+            ->where($query)
+            ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->andWhere('(t2.status')->ne('suspended')->orWhere('t4.status')->ne('suspended')->markRight(1)
+            ->beginIF($moduleName == 'workTask')->andWhere("t1.assignedTo")->eq($account)
+            ->beginIF($moduleName == 'contributeTask')
+            ->andWhere('t1.openedBy', 1)->eq($account)
+            ->orWhere('t1.closedBy')->eq($account)
+            ->orWhere('t1.canceledBy')->eq($account)
+            ->orWhere('t1.finishedby', 1)->eq($account)
+            ->orWhere('t1.finishedList')->like("%,{$account},%")
+            ->orWhere('t1.id')->in($taskIDList)
+            ->markRight(1)
+            ->fi()
+            ->beginIF($this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
+            ->beginIF($this->config->vision)->andWhere('t2.vision')->eq($this->config->vision)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
+            ->orderBy($orderBy)
+            ->beginIF($limit > 0)->limit($limit)->fi()
+            ->page($pager)
+            ->fetchAll('id');
+
+        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', false);
+
+        $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in(array_keys($tasks))->andWhere('type')->eq('task')->fetchGroup('root');
+        if(!empty($taskTeam))
+        {
+            foreach($taskTeam as $taskID => $team) $tasks[$taskID]->team = $team;
+        }
+
+        if($tasks) return $this->loadModel('task')->processTasks($tasks);
+        return array();
+    }
+
+    /**
+     * Build search form for bug page of work.
+     *
+     * @param  int    $queryID
+     * @param  string $actionURL
+     * @access public
+     * @return void
+     */
+    public function buildBugSearchForm($queryID, $actionURL)
+    {
+        $rawMethod = $this->app->rawMethod;
+        $this->loadModel('bug');
+        $this->app->loadConfig('bug');
+
+        $products = $this->loadModel('product')->getPairs();
+
+        $this->config->bug->search['module']    = $rawMethod . 'Bug';
+        $this->config->bug->search['actionURL'] = $actionURL;
+        $this->config->bug->search['queryID']   = $queryID;
+        if($rawMethod == 'work')
+        {
+            unset($this->config->bug->search['fields']['closedDate']);
+            unset($this->config->bug->search['fields']['closedBy']);
+        }
+
+        if($this->config->systemMode == 'new') $this->config->bug->search['params']['project']['values'] = $this->loadModel('project')->getPairsByProgram() + array('all' => $this->lang->bug->allProject) + array('' => '');
+        $this->config->bug->search['params']['execution']['values']     = $this->loadModel('execution')->getPairs();
+        $this->config->bug->search['params']['product']['values']       = $products + array('' => '');
+        $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getPairs();
+        $this->config->bug->search['params']['module']['values']        = $this->loadModel('tree')->getAllModulePairs();
+        $this->config->bug->search['params']['severity']['values']      = array(0 => '') + $this->lang->bug->severityList;
+        $this->config->bug->search['params']['openedBuild']['values']   = $this->loadModel('build')->getBuildPairs($products);
+        $this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
+
+        $this->loadModel('search')->setSearchParams($this->config->bug->search);
+    }
 }
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 69a18b2ab8..edff420e76 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -25,15 +25,23 @@
         echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),   "<span class='text'>{$lang->bug->closedByMe}</span>" . ($type == 'closedBy'   ? $recTotalLabel : ''),   '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
         echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->bug->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
     }
+    else
+    {
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"), "<span class='text'>{$lang->bug->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
+    }
     ?>
   </div>
+  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->my->byQuery;?></a>
 </div>
 <div id="mainContent">
+  <?php $dataModule = $app->rawMethod == 'work' ? 'workBug' : 'contributeBug';?>
   <?php if(empty($bugs)):?>
+  <div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $dataModule;?>></div>
   <div class="table-empty-tip">
     <p><span class="text-muted"><?php echo $lang->bug->noBug;?></span></p>
   </div>
   <?php else:?>
+  <div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $dataModule;?>></div>
   <form id='myBugForm' class="main-table table-bug" data-ride="table" method="post" action='<?php echo $this->createLink('bug', 'batchEdit', "productID=0");?>'>
     <?php
     $canBatchEdit     = (common::hasPriv('bug', 'batchEdit') and $type == 'assignedTo');
@@ -43,7 +51,7 @@
     $canBatchAction   = ($canBatchEdit or $canBatchConfirm or $canBatchClose or $canBatchAssignTo);
     ?>
     <table class="table has-sort-head table-fixed" id='bugList'>
-      <?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+      <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
       <thead>
         <tr>
           <th class="c-id">
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 16e4e4076a..0d3eb6ea33 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -18,29 +18,38 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
-    <?php if($app->rawMethod == 'contribute'):?>
     <?php
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),   "<span class='text'>{$lang->my->taskMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"), "<span class='text'>{$lang->my->taskMenu->finishedByMe}</span>" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),   "<span class='text'>{$lang->my->taskMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"), "<span class='text'>{$lang->my->taskMenu->canceledByMe}</span>" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'");
-    echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->my->taskMenu->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
+    if($app->rawMethod == 'contribute')
+    {
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"),   "<span class='text'>{$lang->my->taskMenu->openedByMe}</span>"   . ($type == 'openedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy'   ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=finishedBy"), "<span class='text'>{$lang->my->taskMenu->finishedByMe}</span>" . ($type == 'finishedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'finishedBy' ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"),   "<span class='text'>{$lang->my->taskMenu->closedByMe}</span>"   . ($type == 'closedBy'   ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy'   ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=canceledBy"), "<span class='text'>{$lang->my->taskMenu->canceledByMe}</span>" . ($type == 'canceledBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'canceledBy' ? ' btn-active-text' : '') . "'");
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->my->taskMenu->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
+    }
+    else
+    {
+        echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedTo"), "<span class='text'>{$lang->my->taskMenu->assignedToMe}</span>" . ($type == 'assignedTo' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedTo' ? ' btn-active-text' : '') . "'");
+    }
     ?>
-    <?php endif;?>
   </div>
+  <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->my->byQuery;?></a>
 </div>
 <div id="mainContent">
+<?php $dataModule = $app->rawMethod == 'work' ? 'workTask' : 'contributeTask';?>
   <?php if(empty($tasks)):?>
+  <div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $dataModule;?>></div>
   <div class="table-empty-tip">
     <p><span class="text-muted"><?php echo $lang->task->noTask;?></span></p>
   </div>
   <?php else:?>
+  <div class="cell<?php if($type == 'bySearch') echo ' show';?>" id="queryBox" data-module=<?php echo $dataModule;?>></div>
   <form id='myTaskForm' class="main-table table-task skip-iframe-modal" method="post">
     <?php $canBatchEdit  = (common::hasPriv('task', 'batchEdit')  and $type == 'assignedTo');?>
     <?php $canBatchClose = (common::hasPriv('task', 'batchClose') and $type != 'closedBy');?>
     <div class="table-responsive">
       <table class="table has-sort-head table-fixed" id='taskTable'>
-        <?php $vars = "mode=$mode&type=$type&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
+        <?php $vars = "mode=$mode&type=$type&param=myQueryID&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"; ?>
         <thead>
           <tr>
             <th class="c-id">
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 4864f75ac9..30c8011570 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -62,6 +62,7 @@ $lang->project->workdaysExceed     = 'No more than『%s』working days';
 $lang->project->teamMembersCount   = ', there are %s team members.';
 $lang->project->budgetNumber       = '『Budget』must be numbers.';
 $lang->project->budgetGe0          = '『Budget』must be greater than or equal to 0.';
+$lang->project->allProjects        = 'All Projects';
 
 /* Fields. */
 $lang->project->common             = 'Project';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 23191cf732..0913b1d071 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -62,6 +62,7 @@ $lang->project->workdaysExceed     = '可用工作日不能超过『%s』天';
 $lang->project->teamMembersCount   = '，团队成员共%s人。';
 $lang->project->budgetNumber       = '『预算』金额必须为数字。';
 $lang->project->budgetGe0          = '『预算』金额必须大于等于0。';
+$lang->project->allProjects        = '所有项目';
 
 /* Fields. */
 $lang->project->common             = '项目';

From 1da67182787365045cd16a468084f08353251fe7 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 9 Jun 2022 05:30:57 +0000
Subject: [PATCH 11/22] * Finish task #56362.

---
 module/execution/js/kanban.js             | 6 +++---
 module/execution/js/taskkanban.js         | 4 ++--
 module/execution/view/kanban.html.php     | 2 +-
 module/execution/view/taskkanban.html.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index f331c9f8e0..40e7914167 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -451,7 +451,7 @@ function renderDeadline(deadline, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['doing','done','pause'];
+    var statusList       = ['doing','pause'];
     var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
@@ -477,7 +477,7 @@ function renderEstStarted(estStarted, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var estStartedDate   = $.zui.formatDate(date, 'MM-dd');
-    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && status =='wait' ? 'text-red' : 'text-muted';
+    var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && status == 'wait' ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(estStartedLang + ' ' + estStartedDate).addClass(textColor);
 }
@@ -647,7 +647,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause' || item.status == 'done')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
         if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 6184835039..856e6b62ef 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -67,7 +67,7 @@ function renderDeadline(deadline, status)
     now.setMilliseconds(0);
     var isEarlyThanToday = date.getTime() < now.getTime();
     var deadlineDate     = $.zui.formatDate(date, 'MM-dd');
-    var statusList       = ['doing','done','pause'];
+    var statusList       = ['doing','pause'];
     var textColor        = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
 
     return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
@@ -258,7 +258,7 @@ function renderTaskItem(item, $item, col)
         var $infos = $item.find('.infos');
         if(!$infos.length) $infos = $('<div class="infos"></div>');
         $infos.html([priHtml, hoursHtml].join(''));
-        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause' || item.status == 'done')) $infos.append(renderDeadline(item.deadline, item.status));
+        if(item.deadline && scaleSize <= 1 && (item.status == 'doing' || item.status == 'pause')) $infos.append(renderDeadline(item.deadline, item.status));
         if(item.estStarted && scaleSize <= 1 && item.status == 'wait') $infos.append(renderEstStarted(item.estStarted, item.status));
         $infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index c4b14adc91..3c3eb88938 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -34,6 +34,7 @@ js::set('executionLang', $lang->execution);
 js::set('bugLang', $lang->bug);
 js::set('taskLang', $lang->task);
 js::set('deadlineLang', $lang->task->deadlineAB);
+js::set('estStartedLang', $lang->task->estStarted);
 js::set('kanbancolumnLang', $lang->kanbancolumn);
 js::set('kanbancardLang', $lang->kanbancard);
 js::set('executionID', $execution->id);
@@ -52,7 +53,6 @@ js::set('vision', $this->config->vision);
 js::set('productCount', count($productNames));
 js::set('executionID', $execution->id);
 js::set('reviewStoryParis', $reviewStoryParis);
-js::set('estStartedLang', $lang->task->estStarted);
 js::set('rdSearchValue', '');
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 5812853dd6..e4bc0cf605 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -207,11 +207,11 @@ js::set('priv',
 <?php js::set('sortColumn', $lang->execution->sortColumn);?>
 <?php js::set('kanbanLang', $lang->kanban);?>
 <?php js::set('deadlineLang', $lang->task->deadlineAB);?>
+<?php js::set('estStartedLang', $lang->task->estStarted);?>
 <?php js::set('noAssigned', $lang->task->noAssigned);?>
 <?php js::set('userList', $userList);?>
 <?php js::set('entertime', time());?>
 <?php js::set('fluidBoard', $execution->fluidBoard);?>
 <?php js::set('displayCards', $execution->displayCards);?>
 <?php js::set('reviewStoryParis', $reviewStoryParis);?>
-<?php js::set('estStartedLang', $lang->task->estStarted);?>
 <?php include '../../common/view/footer.html.php';?>

From f9a14f40d4c597a7f9b074ab3c2fe0940cac9662 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 9 Jun 2022 13:49:54 +0800
Subject: [PATCH 12/22]  * adjust for task #56614.

---
 framework/router.class.php | 10 +++++++---
 module/upgrade/model.php   |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index 043acbfb2f..8012024df6 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -521,7 +521,7 @@ class router extends baseRouter
             if($moduleName == 'flow' and $methodName == 'browse')
             {
                 $mode = 'browse';
-                if(count($params) > 0) $mode = array_shift($params);
+                if(count($params) > 0 and !is_numeric($params[0])) $mode = array_shift($params);
                 array_unshift($params, $mode);
             }
 
@@ -546,9 +546,13 @@ class router extends baseRouter
 
             if($moduleName == 'flow' and $methodName == 'browse')
             {
-                $mode = 'browse';
-                if(count($params) > 0) $mode = array_pop($params);
+                $mode = zget($params, 'mode', 'browse');
+                if(is_numeric($mode)) $mode = 'browse';
                 $params['mode'] = $mode;
+
+                $get = array_reverse($_GET);
+                $get['mode'] = $mode;
+                $_GET = array_reverse($get);
             }
             $params[$this->config->methodVar] = $methodName;        // $param = array('id' => 1, 'f' => 'operate');
             $params[$this->config->moduleVar] = $moduleName;        // $param = array('id' => 1, 'f' => 'operate', 'm' => 'flow');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 574ea6d48a..fd78a62ad3 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -652,6 +652,9 @@ class upgradeModel extends model
             case 'biz7.0.beta1':
                 $this->processViewFields();
                 break;
+            case 'biz7.0':
+                $this->processFlowPosition();
+                break;
         }
     }
 

From 906dc10214790955a936988569fd9377f7bc211e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:01:53 +0800
Subject: [PATCH 13/22] * Fix create user bug.

---
 api/v1/entries/users.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v1/entries/users.php b/api/v1/entries/users.php
index 3e0a5bf543..9696cb0211 100644
--- a/api/v1/entries/users.php
+++ b/api/v1/entries/users.php
@@ -62,8 +62,8 @@ class usersEntry extends entry
 
         $password = $this->request('password', '') ? md5($this->request('password')) : '';
 
-        $visions = $this->request('visions', 'rnd');
-        if(is_array($visions)) $visions = implode(',', $visions);
+        $visions = $this->request('visions', array('rnd'));
+        if(!is_array($visions)) $visions = explode(',', $visions);
 
         $this->setPost('password1', $password);
         $this->setPost('password2', $password);

From 4fb2be7c6141a1e69a4bd0017c66487320d89eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Thu, 9 Jun 2022 14:21:03 +0800
Subject: [PATCH 14/22] * Finish task #56546.

---
 module/message/model.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 module/message/model.php

diff --git a/module/message/model.php b/module/message/model.php
old mode 100644
new mode 100755
index 2dd836966f..a5f2cccd7f
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -89,8 +89,14 @@ class messageModel extends model
                     }
                 }
 
-                $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
-                $this->loadModel('mail')->sendmail($objectID, $actionID);
+                if($objectType == 'feedback')
+                {
+                    $this->loadModel('feedback')->sendmail($objectID, $actionID);
+                }
+                else
+                {
+                    $this->loadModel('mail')->sendmail($objectID, $actionID);
+                }
 
                 if(defined('RUN_MODE') and RUN_MODE == 'api') $config->requestType = $requestType;
             }

From 87e879e047f5b6a7bf544a8bbae64d606c52d973 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:34:11 +0800
Subject: [PATCH 15/22] * Fix bug #23474,23474.

---
 extension/lite/kanban/ext/model/lite.php     | 11 +++++++++++
 extension/lite/task/ext/view/create.html.php |  2 +-
 module/task/control.php                      |  2 --
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extension/lite/kanban/ext/model/lite.php b/extension/lite/kanban/ext/model/lite.php
index 3406eb1c33..753502f3f7 100644
--- a/extension/lite/kanban/ext/model/lite.php
+++ b/extension/lite/kanban/ext/model/lite.php
@@ -5,6 +5,16 @@ public function __construct($appName = '')
     if($this->app->getModuleName() == 'kanban') $this->lang->kanban->menu = new stdclass();
 }
 
+/**
+ * Get kanban group by execution id.
+ *
+ * @param  int    $executionID
+ * @param  int    $browseType
+ * @param  int    $groupBy
+ * @param  string $searchValue
+ * @access public
+ * @return array
+ */
 public function getKanban4Group($executionID, $browseType, $groupBy, $searchValue = '')
 {
     /* Get card  data. */
@@ -132,6 +142,7 @@ public function getKanban4Group($executionID, $browseType, $groupBy, $searchValu
  * @param  int    $kanbanID
  * @param  string $browseType all|task|bug|story
  * @param  string $orderBy
+ * @param  string $searchValue
  * @access public
  * @return array
  */
diff --git a/extension/lite/task/ext/view/create.html.php b/extension/lite/task/ext/view/create.html.php
index f63754c67d..4ca65ab4ad 100644
--- a/extension/lite/task/ext/view/create.html.php
+++ b/extension/lite/task/ext/view/create.html.php
@@ -101,7 +101,7 @@
           <td colspan='3'>
             <span id='storyBox' class="<?php if(!empty($stories)) echo 'hidden';?> "><?php printf($lang->task->noticeLinkStory, html::a($this->createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&storyID=0&projectID=$projectID&bugID=0&planID=0&todoID=0&extra=&type=story"), $lang->execution->linkStory, '_blank', 'class="text-primary"'), html::a("javascript:loadStories($execution->id)", $lang->refresh, '', 'class="text-primary"'));?></span>
             <div class='input-group <?php if(empty($stories)) echo "hidden";?>'>
-              <?php echo html::select('story', array($task->story => empty($stories) ? '': $stories[$task->story]), $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
+              <?php echo html::select('story', $stories, $task->story, "class='form-control chosen' onchange='setStoryRelated();'");?>
               <span class='input-group-btn' id='preview'><a href='#' class='btn iframe'><?php echo $lang->preview;?></a></span>
             </div>
           </td>
diff --git a/module/task/control.php b/module/task/control.php
index a2c2441628..118eac8e05 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -242,8 +242,6 @@ class task extends control
 
         $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed');
 
-        if($this->config->vision == 'lite') $stories = $stories + array('', '');
-
         /* Get block id of assinge to me. */
         $blockID = 0;
         if(isonlybody())

From 5d5bc8f927a1ff4430673c892293ad06afeffe4f Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:35:20 +0800
Subject: [PATCH 16/22] * Finish task#56386.

---
 module/kanban/view/space.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index 8ede245caf..a295b141f6 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -128,7 +128,8 @@
               <div class='kanban-desc' title="<?php echo strip_tags(htmlspecialchars_decode($kanban->desc));?>"><?php echo strip_tags(htmlspecialchars_decode($kanban->desc));?></div>
               <div class='kanban-footer'>
               <?php $count     = 0;?>
-              <?php $teamPairs = array_filter(explode(',', $kanban->team));?>
+              <?php $teamPairs = array_filter(explode(',', ",$kanban->createdBy,$kanban->owner,$kanban->team"));?>
+              <?php $teamPairs = array_unique($teamPairs);?>
               <?php
               foreach($teamPairs as $index => $team)
               {

From c4765a843161aa5c7a37a67c5c13eb5afff0a965 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:41:26 +0800
Subject: [PATCH 17/22] * Fix bug #23441.

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

diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index 88814d0cce..06ddc2a7f5 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -161,7 +161,7 @@ $lang->task->recordEstimateAction = '添加工时';
 
 $lang->task->ditto             = '同上';
 $lang->task->dittoNotice       = "该任务与上一任务不属于同一%s！";
-$lang->task->selectTestStory   = "选择测试需求";
+$lang->task->selectTestStory   = "选择测试{$lang->SRCommon}";
 $lang->task->selectAllUser     = '全部';
 $lang->task->noStory           = "无{$lang->SRCommon}";
 $lang->task->noAssigned        = '未指派';

From ecd7f1197fa4bcdb43fa653b2190a81ece7836af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Thu, 9 Jun 2022 14:48:56 +0800
Subject: [PATCH 18/22] * Fix product order bug.

---
 module/product/control.php |  2 +-
 module/product/model.php   | 42 ++++++++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 8b4940bae5..2d3a6291a9 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1201,7 +1201,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function all($browseType = 'noclosed', $orderBy = 'program_asc,order_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function all($browseType = 'noclosed', $orderBy = 'program_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load module and set session. */
         $this->loadModel('program');
diff --git a/module/product/model.php b/module/product/model.php
index f20a1b7d27..a97bdbcefb 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -339,19 +339,35 @@ class productModel extends model
 
         if(!empty($append) and is_array($append)) $append = implode(',', $append);
 
-        $views    = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
-        $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
-        $products = $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
-            ->from(TABLE_PRODUCT)
-            ->where(1)
-            ->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi()
-            ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
-            ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($views)->fi()
-            ->andWhere('vision')->eq($this->config->vision)
-            ->orderBy($orderBy)
-            ->fetchPairs('id', 'name');
-        return $products;
+        $views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
+        if($this->config->systemMode == 'new')
+        {
+            /* Order by program. */
+            return $this->dao->select('t1.*,  IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed')->from(TABLE_PRODUCT)->alias('t1')
+                ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
+                ->where(1)
+                ->beginIF(strpos($mode, 'all') === false)->andWhere('t1.deleted')->eq(0)->fi()
+                ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi()
+                ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi()
+                ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('t1.id')->in($views)->fi()
+                ->andWhere('t1.vision')->eq($this->config->vision)
+                ->orderBy('isClosed, t2.order_asc, t1.line_desc, t1.order_desc')
+                ->fetchPairs('id', 'name');
+        }
+        else
+        {
+            $orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
+            return $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
+                ->from(TABLE_PRODUCT)
+                ->where(1)
+                ->beginIF(strpos($mode, 'all') === false)->andWhere('deleted')->eq(0)->fi()
+                ->beginIF($programID)->andWhere('program')->eq($programID)->fi()
+                ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
+                ->beginIF(!$this->app->user->admin and $this->config->vision == 'rnd')->andWhere('id')->in($views)->fi()
+                ->andWhere('vision')->eq($this->config->vision)
+                ->orderBy($orderBy)
+                ->fetchPairs('id', 'name');
+        }
     }
 
     /**

From 0918fea373a551afeaf5708dae7f3741b5a6023b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=87=E7=9D=BF=20=E6=9D=8E?= <happy.lwr@gmail.com>
Date: Thu, 9 Jun 2022 06:49:33 +0000
Subject: [PATCH 19/22] * reword xuan message title.

---
 xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
index 6666cd2421..32599f2ce7 100644
--- a/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
+++ b/xuanxuan/extension/xuan/message/ext/lang/zh-cn/xuanxuan.php
@@ -3,7 +3,7 @@ $lang->message->typeList['xuanxuan'] = '聊天';
 
 $lang->message->sender = '禅道项目管理';
 
-$lang->message->notifyTitle = '%s 给您%s%d个%s';
+$lang->message->notifyTitle = '%s %s%d个%s';
 
 $lang->message->mr = new stdClass();
 $lang->message->mr->logTitle    = '构建日志';

From 415542746bad6aed78ca4cee0dafec05c7dfeb12 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:54:54 +0800
Subject: [PATCH 20/22] * Fix bug #23374.

---
 module/story/model.php  | 1 +
 module/task/control.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index f5bea613da..637b91aad8 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2986,6 +2986,7 @@ class storyModel extends model
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
             ->beginIF($status == 'unclosed')->andWhere('t2.status')->ne('closed')->fi()
             ->beginIF($status == 'review')->andWhere('t2.status')->in('draft,changed')->fi()
+            ->beginIF($status == 'active')->andWhere('t2.status')->eq('active')->fi()
             ->orderBy('t1.`order` desc, t1.`story` desc')
             ->fetchAll('id');
         return empty($stories) ? array() : $this->formatStories($stories, $type);
diff --git a/module/task/control.php b/module/task/control.php
index 118eac8e05..693ee426d7 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -240,7 +240,7 @@ class task extends control
             if(!isset($moduleOptionMenu[$task->module])) $task->module = 0;
         }
 
-        $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed');
+        $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'active');
 
         /* Get block id of assinge to me. */
         $blockID = 0;
@@ -537,7 +537,7 @@ class task extends control
         $this->view->title         = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name;
         $this->view->position[]    = $this->lang->task->common;
         $this->view->position[]    = $this->lang->task->edit;
-        $this->view->stories       = $this->story->getExecutionStoryPairs($this->view->execution->id);
+        $this->view->stories       = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active');
         $this->view->tasks         = $tasks;
         $this->view->users         = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
         $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';

From 181fb38e7ec7c78bbc5010219c215d632e592c3d Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 15:11:51 +0800
Subject: [PATCH 21/22] * Fix bug #23125.

---
 extension/lite/story/ext/view/view.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php
index aa8dad0c79..bd48a2e3e3 100644
--- a/extension/lite/story/ext/view/view.html.php
+++ b/extension/lite/story/ext/view/view.html.php
@@ -153,7 +153,6 @@
         common::printIcon('story', 'assignTo', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('story', 'close',    "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('story', 'activate', "storyID=$story->id", $story, 'button', '', '', 'iframe showinonlybody', true);
-        if($this->config->edition == 'max' and $this->app->tab == 'project' and common::hasPriv('story', 'importToLib')) echo html::a('#importToLib', "<i class='icon icon-assets'></i> " . $this->lang->story->importToLib, '', 'class="btn" data-toggle="modal"');
 
         if($from == 'execution' and strpos('draft,closed', $story->status) === false) common::printIcon('task', 'create', "execution=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody');
 

From 63717f4fd090a38680c4990588aa2a61575d0cf3 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 9 Jun 2022 15:18:56 +0800
Subject: [PATCH 22/22] * Fix bug of task #56454.

---
 module/bug/control.php                |  73 +++++++++--------
 module/execution/control.php          |   2 +
 module/execution/js/kanban.js         |  30 ++++---
 module/execution/view/kanban.html.php |   1 +
 module/kanban/control.php             |   3 +-
 module/kanban/model.php               |   2 +-
 module/story/control.php              |  30 ++++---
 module/task/control.php               | 112 ++++++++++++++------------
 8 files changed, 144 insertions(+), 109 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 963aa527e2..a15854651d 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -411,10 +411,11 @@ class bug extends control
                 $execution   = $this->loadModel('execution')->getByID($executionID);
                 if($executionID == $output['executionID'] and $this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
                 else
@@ -709,10 +710,12 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($executionID);
                 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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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
@@ -963,8 +966,9 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
-                    $kanbanData = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1288,8 +1292,9 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
-                    $kanbanData = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1495,11 +1500,12 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1589,11 +1595,12 @@ class bug extends control
             {
                 if(isset($execution->type) and $execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1690,11 +1697,12 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1750,11 +1758,12 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
diff --git a/module/execution/control.php b/module/execution/control.php
index ac8760f403..0a162e7cb3 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2121,6 +2121,7 @@ class execution extends control
         $this->session->set('execLaneType', $browseType);
         $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
+        $this->session->set('rdSearchValue', '');
 
         $this->lang->execution->menu = new stdclass();
         $execution = $this->commonAction($executionID);
@@ -3831,6 +3832,7 @@ class execution extends control
 
         if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue))
         {
+            if($from == 'RD') $this->session->set('rdSearchValue', $searchValue);
             $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue);
             return print(json_encode($kanbanGroup));
         }
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 26ecb547fd..5b8c1e4631 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -740,7 +740,7 @@ function renderHeaderCol($column, column, $header, kanbanData)
     var printMoreBtn = (columnPrivs.includes('setColumn') || columnPrivs.includes('setWIP'));
 
     /* Render more menu. */
-    if(column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed'  && $actions.children('.text-primary').length == 0)
+    if((column.type == 'backlog' || column.type == 'wait' || column.type == 'unconfirmed')  && $actions.children('.text-primary').length == 0)
     {
         var tips = productID ? '' : 'onclick="tips()"';
         $actions.append([
@@ -818,7 +818,6 @@ function updateRegion(regionID, regionData = [])
         if(groupBy == 'default') $("div[data-id^=" + regionID + "].region").show();
         if(groupBy != 'default') $("div[data-id^=" + regionID + "].kanban").show();
     }
-    $region.empty();
     $region.data('zui.kanban').render(data);
     resetRegionHeight('open');
     return true;
@@ -1528,21 +1527,23 @@ $(function()
     /* Ajax update kanban. */
     if(groupBy == 'default')
     {
-        var lastUpdateData;
         setInterval(function()
         {
-            $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue' + rdSearchValue), function(data)
+            if(rdSearchValue == '')
             {
-                if(data && lastUpdateData !== data)
+                $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data)
                 {
-                    lastUpdateData = data;
-                    kanbanData     = $.parseJSON(data);
-                    for(var region in kanbanData)
+                    if(data && lastUpdateData !== data)
                     {
-                        updateRegion(region, kanbanData[region]);
+                        lastUpdateData = data;
+                        kanbanData     = $.parseJSON(data);
+                        for(var region in kanbanData)
+                        {
+                            updateRegion(region, kanbanData[region]);
+                        }
                     }
-                }
-            });
+                });
+            }
         }, 10000);
     }
 
@@ -1640,8 +1641,10 @@ function toggleRDSearchBox()
 function searchCards(value)
 {
     rdSearchValue = value;
-    $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + value), function(data)
+    $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue), function(data)
     {
+        if(lastUpdateData === data) return;
+        lastUpdateData = data;
         var kanbanData = $.parseJSON(data);
         var hideAll    = true;
         $('#kanban').children('.region').children("div[id^='kanban']").each(function()
@@ -1649,6 +1652,9 @@ function searchCards(value)
             var regionID = $(this).attr('data-id');
             if(kanbanData != null) data = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy];
 
+            if(rdSearchValue != '' && data.laneCount != 0) $(this).parent().show();
+            if(rdSearchValue != '' && data.laneCount == 0) $(this).parent().hide();
+
             hideAll = hideAll && !updateRegion(regionID, data);
         });
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 653ad0e4b4..69467ba394 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -53,6 +53,7 @@ js::set('productCount', count($productNames));
 js::set('executionID', $execution->id);
 js::set('reviewStoryParis', $reviewStoryParis);
 js::set('needLinkProducts', $lang->execution->needLinkProducts);
+js::set('lastUpdateData', '');
 js::set('rdSearchValue', '');
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 1b83d01bfb..397dfdbaa1 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1764,7 +1764,8 @@ class kanban extends control
             $this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($toColumn->type)->where('story')->eq($cardID)->exec();
         }
 
-        $kanbanGroup = $regionID == 0 ? $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy) : $this->kanban->getRDKanban($executionID, $browseType, $orderBy, $regionID, $groupBy);
+        $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+        $kanbanGroup   = $regionID == 0 ? $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy) : $this->kanban->getRDKanban($executionID, $browseType, $orderBy, $regionID, $groupBy, $rdSearchValue);
         echo json_encode($kanbanGroup);
     }
 
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 09b45f0eb1..f6c8cbe7bf 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1575,7 +1575,7 @@ class kanbanModel extends model
                     $laneData['cards'][$column->columnType][] = $cardData;
                     $cardOrder ++;
                 }
-                if(empty($searchValue) and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
+                if($searchValue != '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
             }
 
             if($searchValue != '' and empty($laneData['cards'])) continue;
diff --git a/module/story/control.php b/module/story/control.php
index 7ab1f7ecf6..74c8505fd9 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -685,8 +685,9 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
-                    $kanbanData = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1057,10 +1058,11 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -1363,10 +1365,11 @@ class story extends control
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
                     $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -1716,9 +1719,10 @@ class story extends control
                 $execution = $this->execution->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup);
-                    $kanbanData   = json_encode($kanbanData);
+                    $execLaneType  = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $rdSearchValue = $this->session->rdSearchValue ? $this->session->rdSearchValue : '';
+                    $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)"));
                 }
diff --git a/module/task/control.php b/module/task/control.php
index a2c2441628..1c301eefd7 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -173,10 +173,11 @@ 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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -349,10 +350,11 @@ 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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -509,8 +511,9 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
-                    $kanbanData = json_encode($kanbanData);
+                    $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);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -729,8 +732,9 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
-                    $kanbanData = json_encode($kanbanData);
+                    $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);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -977,11 +981,12 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1041,10 +1046,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -1177,11 +1183,12 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1267,11 +1274,12 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1325,10 +1333,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
-                    $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 : '';
+                    $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)"));
                 }
@@ -1398,11 +1407,12 @@ class task extends control
 
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1563,11 +1573,12 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }
@@ -1621,11 +1632,12 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $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';
-                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
-                    $kanbanData   = json_encode($kanbanData);
+                    $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)"));
                 }