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

Fix PHP error in task views (tag colors)

This commit is contained in:
Cyboulette 2019-01-19 22:38:50 +01:00 committed by fguillot
parent f3b944c77f
commit cc34318bc7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/ActivityController.php
View File

@ -56,7 +56,7 @@ class ActivityController extends BaseController
'task' => $task, 'task' => $task,
'project' => $this->projectModel->getById($task['project_id']), 'project' => $this->projectModel->getById($task['project_id']),
'events' => $this->helper->projectActivity->getTaskEvents($task['id']), 'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
'tags' => $this->taskTagModel->getList($task['id']), 'tags' => $this->taskTagModel->getTagsByTask($task['id']),
))); )));
} }
} }

8
app/Controller/TaskViewController.php
View File

@ -45,7 +45,7 @@ class TaskViewController extends BaseController
'task' => $task, 'task' => $task,
'columns_list' => $this->columnModel->getList($task['project_id']), 'columns_list' => $this->columnModel->getList($task['project_id']),
'colors_list' => $this->colorModel->getList(), 'colors_list' => $this->colorModel->getList(),
'tags' => $this->taskTagModel->getList($task['id']), 'tags' => $this->taskTagModel->getTagsByTask($task['id']),
'title' => $task['title'], 'title' => $task['title'],
'no_layout' => true, 'no_layout' => true,
'auto_refresh' => true, 'auto_refresh' => true,
@ -93,7 +93,7 @@ class TaskViewController extends BaseController
'lead_time' => $this->taskAnalyticModel->getLeadTime($task), 'lead_time' => $this->taskAnalyticModel->getLeadTime($task),
'cycle_time' => $this->taskAnalyticModel->getCycleTime($task), 'cycle_time' => $this->taskAnalyticModel->getCycleTime($task),
'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task), 'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task),
'tags' => $this->taskTagModel->getList($task['id']), 'tags' => $this->taskTagModel->getTagsByTask($task['id']),
))); )));
} }
@ -118,7 +118,7 @@ class TaskViewController extends BaseController
'task' => $task, 'task' => $task,
'project' => $this->projectModel->getById($task['project_id']), 'project' => $this->projectModel->getById($task['project_id']),
'subtask_paginator' => $subtask_paginator, 'subtask_paginator' => $subtask_paginator,
'tags' => $this->taskTagModel->getList($task['id']), 'tags' => $this->taskTagModel->getTagsByTask($task['id']),
))); )));
} }
@ -135,7 +135,7 @@ class TaskViewController extends BaseController
'task' => $task, 'task' => $task,
'project' => $this->projectModel->getById($task['project_id']), 'project' => $this->projectModel->getById($task['project_id']),
'transitions' => $this->transitionModel->getAllByTask($task['id']), 'transitions' => $this->transitionModel->getAllByTask($task['id']),
'tags' => $this->taskTagModel->getList($task['id']), 'tags' => $this->taskTagModel->getTagsByTask($task['id']),
))); )));
} }
} }