From 9e278a9370e3b651a4a545c0c0c0c256088ed187 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Fri, 24 Jun 2016 08:50:57 -0400
Subject: Use BoardFormatter to generate the board

---
 app/Controller/BoardAjaxController.php | 2 +-
 app/Controller/BoardViewController.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/BoardAjaxController.php b/app/Controller/BoardAjaxController.php
index 24914671..9b721f06 100644
--- a/app/Controller/BoardAjaxController.php
+++ b/app/Controller/BoardAjaxController.php
@@ -134,7 +134,7 @@ class BoardAjaxController extends BaseController
             'board_highlight_period' => $this->configModel->get('board_highlight_period'),
             'swimlanes' => $this->taskLexer
                 ->build($this->userSession->getFilters($project_id))
-                ->format(BoardFormatter::getInstance($this->container)->setProjectId($project_id))
+                ->format(BoardFormatter::getInstance($this->container)->withProjectId($project_id))
         ));
     }
 }
diff --git a/app/Controller/BoardViewController.php b/app/Controller/BoardViewController.php
index 496fa995..97c99d11 100644
--- a/app/Controller/BoardViewController.php
+++ b/app/Controller/BoardViewController.php
@@ -30,7 +30,11 @@ class BoardViewController extends BaseController
 
         $this->response->html($this->helper->layout->app('board/view_public', array(
             'project' => $project,
-            'swimlanes' => $this->boardModel->getBoard($project['id']),
+            'swimlanes' => BoardFormatter::getInstance($this->container)
+                ->withProjectId($project['id'])
+                ->withQuery($this->taskFinderModel->getExtendedQuery())
+                ->format()
+            ,
             'title' => $project['name'],
             'description' => $project['description'],
             'no_layout' => true,
@@ -59,7 +63,7 @@ class BoardViewController extends BaseController
             'board_highlight_period' => $this->configModel->get('board_highlight_period'),
             'swimlanes' => $this->taskLexer
                 ->build($search)
-                ->format(BoardFormatter::getInstance($this->container)->setProjectId($project['id']))
+                ->format(BoardFormatter::getInstance($this->container)->withProjectId($project['id']))
         )));
     }
 }
-- 
cgit v1.2.3