AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove method Category::getBoardCategories()

This commit is contained in:
Frederic Guillot 2015-07-01 20:55:21 -04:00
parent 471e46e702
commit 747b9434d3
11 changed files with 7 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Controller/Board.php
View File

@ -26,14 +26,10 @@ 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_listing' => $categories_listing,
'categories_description' => $categories_description,
'title' => $project['name'],
'description' => $project['description'],
'no_layout' => true,
@ -58,15 +54,12 @@ class Board extends Base
$board_selector = $projects;
unset($board_selector[$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_listing' => $categories_listing,
'categories_description' => $categories_description,
'categories_listing' => $this->category->getList($project['id'], true, true),
'title' => $project['name'],
'description' => $project['description'],
'board_selector' => $board_selector,
@ -106,14 +99,10 @@ 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_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'),
)),
@ -143,14 +132,10 @@ 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_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'),
))

32
app/Model/Category.php
View File

@ -73,38 +73,6 @@ class Category extends Base
->findOneColumn('id');
}
/**
* Prepare categories to be displayed on the board
*
* @access public
* @param integer $project_id
* @return array
*/
public function getBoardCategories($project_id)
{
$descriptions = array();
$listing = array(
-1 => t('All categories'),
0 => t('No category'),
);
$categories = $this->db->table(self::TABLE)
->eq('project_id', $project_id)
->asc('name')
->findAll();
foreach ($categories as $category) {
$listing[$category['id']] = $category['name'];
$descriptions[$category['id']] = $category['description'];
}
return array(
$listing,
$descriptions,
);
}
/**
* Return the list of all categories
*

1
app/Model/TaskFinder.php
View File

@ -100,6 +100,7 @@ class TaskFinder extends Base
User::TABLE.'.username AS assignee_username',
User::TABLE.'.name AS assignee_name',
Category::TABLE.'.name AS category_name',
Category::TABLE.'.description AS category_description',
Board::TABLE.'.title AS column_name',
Project::TABLE.'.name AS project_name'
)

2
app/Template/board/index.php
View File

@ -9,8 +9,6 @@
<?= $this->render('board/show', array(
'project' => $project,
'swimlanes' => $swimlanes,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'board_private_refresh_interval' => $board_private_refresh_interval,
'board_highlight_period' => $board_highlight_period,
)) ?>

2
app/Template/board/public.php
View File

@ -3,8 +3,6 @@
<?= $this->render('board/show', array(
'project' => $project,
'swimlanes' => $swimlanes,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'board_private_refresh_interval' => $board_private_refresh_interval,
'board_highlight_period' => $board_highlight_period,
'not_editable' => true,

2
app/Template/board/show.php
View File

@ -21,8 +21,6 @@
'project' => $project,
'swimlane' => $swimlane,
'board_highlight_period' => $board_highlight_period,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'hide_swimlane' => count($swimlanes) === 1,
'not_editable' => isset($not_editable),
)) ?>

2
app/Template/board/swimlane.php
View File

@ -74,8 +74,6 @@
<?= $this->render($not_editable ? 'board/task_public' : 'board/task_private', array(
'project' => $project,
'task' => $task,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'board_highlight_period' => $board_highlight_period,
'not_editable' => $not_editable,
)) ?>

8
app/Template/board/task_footer.php
View File

@ -2,16 +2,16 @@
<div class="task-board-category-container">
<span class="task-board-category">
<?php if ($not_editable): ?>
<?= $this->text->in($task['category_id'], $categories_listing) ?>
<?= $this->e($task['category_name']) ?>
<?php else: ?>
<?= $this->url->link(
$this->text->in($task['category_id'], $categories_listing),
$this->e($task['category_name']),
'board',
'changeCategory',
array('task_id' => $task['id'], 'project_id' => $task['project_id']),
false,
'task-board-popover' . (isset($categories_description[$task['category_id']]) ? ' column-tooltip' : ''),
isset($categories_description[$task['category_id']]) ? $this->text->markdown($categories_description[$task['category_id']]) : t('Change category')
'task-board-popover' . (! empty($task['category_description']) ? ' column-tooltip' : ''),
! empty($task['category_description']) ? $this->text->markdown($task['category_description']) : t('Change category')
) ?>
<?php endif ?>
</span>

2
app/Template/board/task_private.php
View File

@ -42,8 +42,6 @@
<?= $this->render('board/task_footer', array(
'task' => $task,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'not_editable' => $not_editable,
)) ?>
</div>

2
app/Template/board/task_public.php
View File

@ -24,8 +24,6 @@
<?= $this->render('board/task_footer', array(
'task' => $task,
'categories_listing' => $categories_listing,
'categories_description' => $categories_description,
'not_editable' => $not_editable,
)) ?>
</div>

2
app/Template/project/sidebar.php
View File

@ -16,7 +16,7 @@
<?= $this->url->link(t('Edit project'), 'project', 'edit', array('project_id' => $project['id'])) ?>
</li>
<li>
<?= $this->url->link(t('Edit board'), 'column', 'index', array('project_id' => $project['id'])) ?>
<?= $this->url->link(t('Columns'), 'column', 'index', array('project_id' => $project['id'])) ?>
</li>
<li>
<?= $this->url->link(t('Swimlanes'), 'swimlane', 'index', array('project_id' => $project['id'])) ?>