diff --git a/module/execution/control.php b/module/execution/control.php index d2f065afdc..1ab583e682 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1846,7 +1846,6 @@ class execution extends control $this->kanban->createLanes($executionID); $kanbanGroup = $this->kanban->getExecutionKanban($executionID); } - a($kanbanGroup);die; $this->execution->setMenu($executionID); $execution = $this->loadModel('execution')->getById($executionID); diff --git a/module/kanban/model.php b/module/kanban/model.php index 98e67ca832..17d70e0995 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -50,7 +50,7 @@ class kanbanModel extends model $laneData['id'] = $lane->type; $laneData['name'] = $lane->name; $laneData['color'] = $lane->color; - $laneData['defaultItemType'] = $lane->type; + $laneData['defaultCardType'] = $lane->type; $laneData['order'] = $lane->order; foreach($columns[$laneID] as $colID => $col) @@ -69,12 +69,12 @@ class kanbanModel extends model foreach($columns[$laneID] as $colID => $col) { - $columnData[$col->parent]['subs']['id'] = $lane->type . '-' . $col->type; - $columnData[$col->parent]['subs']['type'] = $col->type; - $columnData[$col->parent]['subs']['name'] = $col->name; - $columnData[$col->parent]['subs']['color'] = $col->color; - $columnData[$col->parent]['subs']['limit'] = $col->limit; - $columnData[$col->parent]['subs']['parentType'] = $columnData[$col->parent]['type']; + $columnData[$col->parent]['subs'][$col->id]['id'] = $lane->type . '-' . $col->type; + $columnData[$col->parent]['subs'][$col->id]['type'] = $col->type; + $columnData[$col->parent]['subs'][$col->id]['name'] = $col->name; + $columnData[$col->parent]['subs'][$col->id]['color'] = $col->color; + $columnData[$col->parent]['subs'][$col->id]['limit'] = $col->limit; + $columnData[$col->parent]['subs'][$col->id]['parentType'] = $columnData[$col->parent]['type']; $cardIdList = array_filter(explode(',', $col->cards)); $cardOrder = 1; @@ -96,7 +96,7 @@ class kanbanModel extends model } $kanban[$lane->type]['id'] = $lane->type; - $kanban[$lane->type]['columns'] = $columnData; + $kanban[$lane->type]['columns'] = array_values($columnData); $kanban[$lane->type]['lanes'] = $laneData; } @@ -152,6 +152,7 @@ class kanbanModel extends model if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID; if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID; + if(strpos(',develop,test,', $colType) !== false) $data->parent = -1; if(strpos(',ready,develop,test,', $colType) === false) { $storyStatus = $this->config->kanban->storyColumnStatusList[$colType];