From c45866a3a32dca367fad01a4c91fb6959262a8dd Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Tue, 26 Oct 2021 15:24:09 +0800
Subject: [PATCH]  * Code for task #43519.

---
 module/kanban/config.php           | 12 +++++-------
 module/kanban/model.php            | 12 ++++++------
 module/kanban/view/setwip.html.php |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/kanban/config.php b/module/kanban/config.php
index bbb2528cdb..573728094d 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -21,13 +21,16 @@ $config->kanban->default->task->name  = $lang->task->common;
 $config->kanban->default->task->color = '#4169e1';
 $config->kanban->default->task->order = '15';
 
+$config->kanban->parentColumn = array();
+$config->kanban->parentColumn['story'] = array('develop', 'test');
+$config->kanban->parentColumn['bug']   = array('resolving', 'test');
+$config->kanban->parentColumn['task']  = array('develop');
+
 $config->kanban->storyColumnStageList = array();
 $config->kanban->storyColumnStageList['backlog']    = 'projected';
 $config->kanban->storyColumnStageList['ready']      = 'projected';
-$config->kanban->storyColumnStageList['develop']    = 'developing';
 $config->kanban->storyColumnStageList['developing'] = 'developing';
 $config->kanban->storyColumnStageList['developed']  = 'developed';
-$config->kanban->storyColumnStageList['test']       = 'testing';
 $config->kanban->storyColumnStageList['testing']    = 'testing';
 $config->kanban->storyColumnStageList['tested']     = 'tested';
 $config->kanban->storyColumnStageList['verified']   = 'verified';
@@ -37,10 +40,8 @@ $config->kanban->storyColumnStageList['closed']     = 'closed';
 $config->kanban->storyColumnStatusList = array();
 $config->kanban->storyColumnStatusList['backlog']    = 'active';
 $config->kanban->storyColumnStatusList['ready']      = 'active';
-$config->kanban->storyColumnStatusList['develop']    = 'active';
 $config->kanban->storyColumnStatusList['developing'] = 'active';
 $config->kanban->storyColumnStatusList['developed']  = 'active';
-$config->kanban->storyColumnStatusList['test']       = 'active';
 $config->kanban->storyColumnStatusList['testing']    = 'active';
 $config->kanban->storyColumnStatusList['tested']     = 'active';
 $config->kanban->storyColumnStatusList['verified']   = 'active';
@@ -50,17 +51,14 @@ $config->kanban->storyColumnStatusList['closed']     = 'closed';
 $config->kanban->bugColumnStatusList = array();
 $config->kanban->bugColumnStatusList['unconfirmed'] = 'active';
 $config->kanban->bugColumnStatusList['confirmed']   = 'active';
-$config->kanban->bugColumnStatusList['resolving']   = 'active';
 $config->kanban->bugColumnStatusList['fixing']      = 'active';
 $config->kanban->bugColumnStatusList['fixed']       = 'resolved';
-$config->kanban->bugColumnStatusList['test']        = 'resolved';
 $config->kanban->bugColumnStatusList['testing']     = 'resolved';
 $config->kanban->bugColumnStatusList['tested']      = 'resolved';
 $config->kanban->bugColumnStatusList['closed']      = 'closed';
 
 $config->kanban->taskColumnStatusList = array();
 $config->kanban->taskColumnStatusList['wait']       = 'wait';
-$config->kanban->taskColumnStatusList['develop']    = 'wait';
 $config->kanban->taskColumnStatusList['developing'] = 'doing';
 $config->kanban->taskColumnStatusList['developed']  = 'done';
 $config->kanban->taskColumnStatusList['pause']      = 'pause';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index d4cf5e496b..f485bdfd1e 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -267,12 +267,12 @@ class kanbanModel extends model
     }
 
     /**
-     ** Get column by id.
-     **
-     ** @param  int    $columnID
-     ** @access public
-     ** @return object
-     **/
+     * Get column by id.
+     *
+     * @param  int    $columnID
+     * @access public
+     * @return object
+     */
     public function getColumnById($columnID)
     {
         $column = $this->dao->select('t1.*, t2.type as laneType')->from(TABLE_KANBANCOLUMN)->alias('t1')
diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php
index 2cca3105b1..df3c066d53 100644
--- a/module/kanban/view/setwip.html.php
+++ b/module/kanban/view/setwip.html.php
@@ -21,6 +21,7 @@
     </div>
     <form method='post' target='hiddenwin' onsubmit='return setWIPLimit();'>
       <table align='center' class='table table-form'>
+        <?php if(!in_array($column->type, $config->kanban->parentColumn[$column->laneType])):?>
         <tr>
           <th><?php echo $lang->kanban->WIPStatus;?></th>
           <td colspan='2'>
@@ -37,6 +38,7 @@
           </td>
         </tr>
         <?php endif;?>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->kanban->WIPCount;?></th>
           <td colspan='2'>