Merge branch 'stable' of https://github.com/kanboard/kanboard

1 files changed, 16 insertions, 6 deletions

diff --git a/app/Formatter/BoardFormatter.php b/app/Formatter/BoardFormatter.php
index dbc7cf21..350dde6c 100644
--- a/app/Formatter/BoardFormatter.php
+++ b/app/Formatter/BoardFormatter.php
@@ -28,7 +28,7 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface
      * @param  integer $projectId
      * @return $this
      */
-    public function setProjectId($projectId)
+    public function withProjectId($projectId)
     {
         $this->projectId = $projectId;
         return $this;
@@ -42,15 +42,25 @@ class BoardFormatter extends BaseFormatter implements FormatterInterface
      */
     public function format()
     {
+        $swimlanes = $this->swimlaneModel->getSwimlanes($this->projectId);
+        $columns = $this->columnModel->getAll($this->projectId);
         $tasks = $this->query
             ->eq(TaskModel::TABLE.'.project_id', $this->projectId)
             ->asc(TaskModel::TABLE.'.position')
             ->findAll();
 
-        return $this->boardModel->getBoard($this->projectId, function ($project_id, $column_id, $swimlane_id) use ($tasks) {
-            return array_filter($tasks, function (array $task) use ($column_id, $swimlane_id) {
-                return $task['column_id'] == $column_id && $task['swimlane_id'] == $swimlane_id;
-            });
-        });
+        $task_ids = array_column($tasks, 'id');
+        $tags = $this->taskTagModel->getTagsByTasks($task_ids);
+
+        if (empty($swimlanes) || empty($columns)) {
+            return array();
+        }
+
+        return BoardSwimlaneFormatter::getInstance($this->container)
+            ->withSwimlanes($swimlanes)
+            ->withColumns($columns)
+            ->withTasks($tasks)
+            ->withTags($tags)
+            ->format();
     }
 }