diff --git a/module/kanban/control.php b/module/kanban/control.php index c86e1d5428..cb0b3a726a 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1711,7 +1711,12 @@ class kanban extends control public function ajaxGetColumns(int $laneID) { $lane = $this->kanban->getLaneByID($laneID); - $columns = $this->kanban->getColumnPairsByGroup($lane->group); + $columns = $this->dao->select('id,name')->from(TABLE_KANBANCOLUMN) + ->where('deleted')->eq(0) + ->andWhere('`group`')->eq($lane->group) + ->andWhere('parent')->ne('-1') + ->orderBy('id_asc') + ->fetchPairs(); $columnList = array(); foreach($columns as $columnID => $columnName) $columnList[] = array('value' => $columnID, 'text' => $columnName); diff --git a/module/kanban/tao.php b/module/kanban/tao.php index 3df234da2d..4b3361defc 100644 --- a/module/kanban/tao.php +++ b/module/kanban/tao.php @@ -160,7 +160,7 @@ class kanbanTao extends kanbanModel */ protected function addChildColumnCell(int $columnID, int $childColumnID, int $i = 0) { - $cellList = $this->dao->select('*')->from(TABLE_KANBANCELL)->where('`column`')->eq($columnID)->fetchAll(); + $cellList = $this->dao->select('*')->from(TABLE_KANBANCELL)->where('`column`')->eq($columnID)->fetchAll('', false); foreach($cellList as $cell) { $newCell = new stdclass();