diff options
author | Frederic Guillot <fred@kanboard.net> | 2015-07-19 14:14:05 -0400 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2015-07-19 14:14:05 -0400 |
commit | d1bfc29f1b738b396e4fb9befa9b49c24f4e9249 (patch) | |
tree | fa41906a61007c0893ca7ab238ed52f853bb452f /app/Controller | |
parent | 9eeb7d18201ad817d8c5eb88995a48c5bd44d22a (diff) |
Add settings option to define the default task color
Diffstat (limited to 'app/Controller')
-rw-r--r-- | app/Controller/Config.php | 1 | ||||
-rw-r--r-- | app/Controller/Task.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/Controller/Config.php b/app/Controller/Config.php index 1e6b3dc8..206237c0 100644 --- a/app/Controller/Config.php +++ b/app/Controller/Config.php @@ -104,6 +104,7 @@ class Config extends Base $this->common('project'); $this->response->html($this->layout('config/project', array( + 'colors' => $this->color->getList(), 'default_columns' => implode(', ', $this->board->getDefaultColumns()), 'title' => t('Settings').' > '.t('Project settings'), ))); diff --git a/app/Controller/Task.php b/app/Controller/Task.php index db12a0c7..6e525b13 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -122,7 +122,7 @@ class Task extends Base $values = array( 'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)), 'column_id' => $this->request->getIntegerParam('column_id'), - 'color_id' => $this->request->getStringParam('color_id'), + 'color_id' => $this->request->getStringParam('color_id', $this->color->getDefaultColor()), 'owner_id' => $this->request->getIntegerParam('owner_id'), 'another_task' => $this->request->getIntegerParam('another_task'), ); |