From d1bfc29f1b738b396e4fb9befa9b49c24f4e9249 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 19 Jul 2015 14:14:05 -0400 Subject: Add settings option to define the default task color --- app/Controller/Config.php | 1 + app/Controller/Task.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Controller') 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'), ); -- cgit v1.2.3