From 9d4cd31e1aae02e9980932c67036fdfe574e3432 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 9 Aug 2018 21:35:11 +0200 Subject: Allow to associate tags to colors The color is then used as background in the board, list and task details views --- app/Model/TaskTagModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Model/TaskTagModel.php') diff --git a/app/Model/TaskTagModel.php b/app/Model/TaskTagModel.php index 78b7a90a..14d2db48 100644 --- a/app/Model/TaskTagModel.php +++ b/app/Model/TaskTagModel.php @@ -46,7 +46,7 @@ class TaskTagModel extends Base public function getTagsByTask($task_id) { return $this->db->table(TagModel::TABLE) - ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name') + ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name', TagModel::TABLE.'.color_id') ->eq(self::TABLE.'.task_id', $task_id) ->join(self::TABLE, 'tag_id', 'id') ->findAll(); @@ -66,7 +66,7 @@ class TaskTagModel extends Base } $tags = $this->db->table(TagModel::TABLE) - ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name', self::TABLE.'.task_id') + ->columns(TagModel::TABLE.'.id', TagModel::TABLE.'.name', TagModel::TABLE.'.color_id', self::TABLE.'.task_id') ->in(self::TABLE.'.task_id', $task_ids) ->join(self::TABLE, 'tag_id', 'id') ->asc(TagModel::TABLE.'.name') -- cgit v1.2.3