diff options
| author | Julian Maurice <julian.maurice@biblibre.com> | 2018-08-09 21:35:11 +0200 |
|---|---|---|
| committer | Julian Maurice <julian.maurice@biblibre.com> | 2018-08-11 10:15:13 +0200 |
| commit | 9d4cd31e1aae02e9980932c67036fdfe574e3432 (patch) | |
| tree | 6fca71d93aaed9032a0d771a0b8111d79fdc99b6 /app/Model/TaskTagModel.php | |
| parent | ae3ade0908bae350488260ee5d878a2ffbff605a (diff) | |
Allow to associate tags to colors
The color is then used as background in the board, list and task details
views
Diffstat (limited to 'app/Model/TaskTagModel.php')
| -rw-r--r-- | app/Model/TaskTagModel.php | 4 |
1 files changed, 2 insertions, 2 deletions
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') |