From cc34318bc79403421be582c15186eb4d523013a1 Mon Sep 17 00:00:00 2001
From: Cyboulette <cyboulette58@gmail.com>
Date: Sat, 19 Jan 2019 22:38:50 +0100
Subject: Fix PHP error in task views (tag colors)

---
 app/Controller/ActivityController.php | 2 +-
 app/Controller/TaskViewController.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app')

diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index 7a58e670..5db02529 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -56,7 +56,7 @@ class ActivityController extends BaseController
             'task'    => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'events'  => $this->helper->projectActivity->getTaskEvents($task['id']),
-            'tags'    => $this->taskTagModel->getList($task['id']),
+            'tags'    => $this->taskTagModel->getTagsByTask($task['id']),
         )));
     }
 }
diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index 9a39a3a9..05c59bc9 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -45,7 +45,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'columns_list' => $this->columnModel->getList($task['project_id']),
             'colors_list' => $this->colorModel->getList(),
-            'tags' => $this->taskTagModel->getList($task['id']),
+            'tags' => $this->taskTagModel->getTagsByTask($task['id']),
             'title' => $task['title'],
             'no_layout' => true,
             'auto_refresh' => true,
@@ -93,7 +93,7 @@ class TaskViewController extends BaseController
             'lead_time' => $this->taskAnalyticModel->getLeadTime($task),
             'cycle_time' => $this->taskAnalyticModel->getCycleTime($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,
             'project' => $this->projectModel->getById($task['project_id']),
             '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,
             'project' => $this->projectModel->getById($task['project_id']),
             'transitions' => $this->transitionModel->getAllByTask($task['id']),
-            'tags' => $this->taskTagModel->getList($task['id']),
+            'tags' => $this->taskTagModel->getTagsByTask($task['id']),
         )));
     }
 }
-- 
cgit v1.2.3