diff options
| author | Julian Maurice <julian.maurice@biblibre.com> | 2018-08-09 19:45:51 +0200 |
|---|---|---|
| committer | Julian Maurice <julian.maurice@biblibre.com> | 2018-08-09 19:45:51 +0200 |
| commit | ae3ade0908bae350488260ee5d878a2ffbff605a (patch) | |
| tree | 747db7edaca2fcb6d3c23594437b995528790ced /app/Model | |
| parent | efd64d842d82404612baef58d9debe1af7515a66 (diff) | |
Allow to associate project categories to colors
The color is then used as background in the board and list views
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/ColorModel.php | 2 | ||||
| -rw-r--r-- | app/Model/TaskFinderModel.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/Model/ColorModel.php b/app/Model/ColorModel.php index 7da05fcf..d0df2ed6 100644 --- a/app/Model/ColorModel.php +++ b/app/Model/ColorModel.php @@ -218,7 +218,7 @@ class ColorModel extends Base $buffer = ''; foreach ($this->default_colors as $color => $values) { - $buffer .= '.task-board.color-'.$color.', .task-summary-container.color-'.$color.', .color-picker-square.color-'.$color.' {'; + $buffer .= '.task-board.color-'.$color.', .task-summary-container.color-'.$color.', .color-picker-square.color-'.$color.', .task-board-category.color-'.$color.', .table-list-category.color-'.$color.' {'; $buffer .= 'background-color: '.$values['background'].';'; $buffer .= 'border-color: '.$values['border']; $buffer .= '}'; diff --git a/app/Model/TaskFinderModel.php b/app/Model/TaskFinderModel.php index e3b5e0b9..0c96a821 100644 --- a/app/Model/TaskFinderModel.php +++ b/app/Model/TaskFinderModel.php @@ -123,6 +123,7 @@ class TaskFinderModel extends Base UserModel::TABLE.'.avatar_path AS assignee_avatar_path', CategoryModel::TABLE.'.name AS category_name', CategoryModel::TABLE.'.description AS category_description', + CategoryModel::TABLE.'.color_id AS category_color_id', ColumnModel::TABLE.'.title AS column_name', ColumnModel::TABLE.'.position AS column_position', SwimlaneModel::TABLE.'.name AS swimlane_name', |