diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-04-11 16:26:45 -0400 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-04-11 16:26:45 -0400 |
| commit | d3727e92a6000a01fb962e559f8e6b936def1fb9 (patch) | |
| tree | 23a12c7c7db5644f0a938eb0d4bed2c81d811a61 /app/Controller/Board.php | |
| parent | 52bc2efc65af690b075d58dcff23eac97d1a0495 (diff) | |
Add category description (merge and modify pull-request #692)
Diffstat (limited to 'app/Controller/Board.php')
| -rw-r--r-- | app/Controller/Board.php | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/app/Controller/Board.php b/app/Controller/Board.php index fa22226e..47248fa2 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -121,11 +121,14 @@ class Board extends Base $this->forbidden(true); } + list($categories_listing, $categories_description) = $this->category->getBoardCategories($project['id']); + // Display the board with a specific layout $this->response->html($this->template->layout('board/public', array( 'project' => $project, 'swimlanes' => $this->board->getBoard($project['id']), - 'categories' => $this->category->getList($project['id'], false), + 'categories_listing' => $categories_listing, + 'categories_description' => $categories_description, 'title' => $project['name'], 'description' => $project['description'], 'no_layout' => true, @@ -181,12 +184,15 @@ class Board extends Base $this->userSession->storeLastSeenProjectId($project['id']); + list($categories_listing, $categories_description) = $this->category->getBoardCategories($project['id']); + $this->response->html($this->template->layout('board/index', array( 'users' => $this->projectPermission->getMemberList($project['id'], true, true), 'projects' => $projects, 'project' => $project, 'swimlanes' => $this->board->getBoard($project['id']), - 'categories' => $this->category->getList($project['id'], true, true), + 'categories_listing' => $categories_listing, + 'categories_description' => $categories_description, 'title' => $project['name'], 'description' => $project['description'], 'board_selector' => $board_selector, @@ -358,11 +364,14 @@ class Board extends Base return $this->response->status(400); } + list($categories_listing, $categories_description) = $this->category->getBoardCategories($project_id); + $this->response->html( $this->template->render('board/show', array( 'project' => $this->project->getById($project_id), 'swimlanes' => $this->board->getBoard($project_id), - 'categories' => $this->category->getList($project_id, false), + 'categories_listing' => $categories_listing, + 'categories_description' => $categories_description, 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), 'board_highlight_period' => $this->config->get('board_highlight_period'), )), @@ -392,11 +401,14 @@ class Board extends Base return $this->response->status(304); } + list($categories_listing, $categories_description) = $this->category->getBoardCategories($project_id); + $this->response->html( $this->template->render('board/show', array( 'project' => $this->project->getById($project_id), 'swimlanes' => $this->board->getBoard($project_id), - 'categories' => $this->category->getList($project_id, false), + 'categories_listing' => $categories_listing, + 'categories_description' => $categories_description, 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'), 'board_highlight_period' => $this->config->get('board_highlight_period'), )) |