From 648e03a8d063252e9e7d84f854da64d1e59337a1 Mon Sep 17 00:00:00 2001 From: Olivier Maridat Date: Tue, 26 Jan 2016 13:32:08 +0100 Subject: Update task link tooltip view --- app/Controller/BoardTooltip.php | 2 +- app/Helper/Task.php | 17 +++++++++++++++ app/Model/TaskLink.php | 1 + app/Template/board/tooltip_tasklinks.php | 37 ++++++++++++++++++-------------- 4 files changed, 40 insertions(+), 17 deletions(-) (limited to 'app') diff --git a/app/Controller/BoardTooltip.php b/app/Controller/BoardTooltip.php index ed58a2f2..bcf7de81 100644 --- a/app/Controller/BoardTooltip.php +++ b/app/Controller/BoardTooltip.php @@ -19,7 +19,7 @@ class BoardTooltip extends Base { $task = $this->getTask(); $this->response->html($this->template->render('board/tooltip_tasklinks', array( - 'links' => $this->taskLink->getAll($task['id']), + 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), 'task' => $task, ))); } diff --git a/app/Helper/Task.php b/app/Helper/Task.php index 500b8a89..d2c59ee9 100644 --- a/app/Helper/Task.php +++ b/app/Helper/Task.php @@ -12,6 +12,14 @@ use Kanboard\Core\Base; */ class Task extends Base { + /** + * Local cache for project columns + * + * @access private + * @var array + */ + private $columns = array(); + public function getColors() { return $this->color->getList(); @@ -65,4 +73,13 @@ class Task extends Base return $html; } + + public function getProgress($task) + { + if (! isset($this->columns[$task['project_id']])) { + $this->columns[$task['project_id']] = $this->board->getColumnsList($task['project_id']); + } + + return $this->task->getProgress($task, $this->columns[$task['project_id']]); + } } diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php index 87aae55e..034fcf45 100644 --- a/app/Model/TaskLink.php +++ b/app/Model/TaskLink.php @@ -75,6 +75,7 @@ class TaskLink extends Base Task::TABLE.'.title', Task::TABLE.'.is_active', Task::TABLE.'.project_id', + Task::TABLE.'.column_id', Task::TABLE.'.time_spent AS task_time_spent', Task::TABLE.'.time_estimated AS task_time_estimated', Task::TABLE.'.owner_id AS task_assignee_id', diff --git a/app/Template/board/tooltip_tasklinks.php b/app/Template/board/tooltip_tasklinks.php index 62304330..b51f90ed 100644 --- a/app/Template/board/tooltip_tasklinks.php +++ b/app/Template/board/tooltip_tasklinks.php @@ -1,19 +1,24 @@ \ No newline at end of file -- cgit v1.2.3