Add settings option to define the default task color

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'),
         )));

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'),
             );

app/Locale/da_DK/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/de_DE/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/es_ES/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/fi_FI/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/fr_FR/translations.php

@@ -1000,4 +1000,5 @@ return array(
     'Gitlab issue comment created' => 'Commentaire créé sur un ticket Gitlab',
     'New remote user' => 'Créer un utilisateur distant',
     'New local user' => 'Créer un utilisateur local',
+    'Default task color' => 'Couleur par défaut des tâches',
 );

app/Locale/hu_HU/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/it_IT/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/ja_JP/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/nl_NL/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/pl_PL/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/pt_BR/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/ru_RU/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/sr_Latn_RS/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/sv_SE/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/th_TH/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/tr_TR/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Locale/zh_CN/translations.php

@@ -998,4 +998,5 @@ return array(
     // 'Gitlab issue comment created' => '',
     // 'New remote user' => '',
     // 'New local user' => '',
+    // 'Default task color' => '',
 );

app/Model/Color.php

@@ -147,7 +147,7 @@ class Color extends Base
      */
     public function getDefaultColor()
     {
-        return 'yellow'; // TODO: make this parameter configurable
+        return $this->config->get('default_color', 'yellow');
     }
 
     /**

app/Schema/Mysql.php

@@ -6,7 +6,12 @@ use PDO;
 use Core\Security;
 use Model\Link;
 
-const VERSION = 79;
+const VERSION = 80;
+
+function version_80($pdo)
+{
+    $pdo->exec("INSERT INTO settings VALUES ('default_color', 'yellow')");
+}
 
 function version_79($pdo)
 {

app/Schema/Postgres.php

@@ -6,7 +6,12 @@ use PDO;
 use Core\Security;
 use Model\Link;
 
-const VERSION = 59;
+const VERSION = 60;
+
+function version_60($pdo)
+{
+    $pdo->exec("INSERT INTO settings VALUES ('default_color', 'yellow')");
+}
 
 function version_59($pdo)
 {

app/Schema/Sqlite.php

@@ -6,7 +6,12 @@ use Core\Security;
 use PDO;
 use Model\Link;
 
-const VERSION = 75;
+const VERSION = 76;
+
+function version_76($pdo)
+{
+    $pdo->exec("INSERT INTO settings VALUES ('default_color', 'yellow')");
+}
 
 function version_75($pdo)
 {

app/Template/config/project.php

@@ -6,6 +6,9 @@
 
     <?= $this->form->csrf() ?>
 
+    <?= $this->form->label(t('Default task color'), 'default_color') ?>
+    <?= $this->form->select('default_color', $colors, $values, $errors) ?>
+
     <?= $this->form->label(t('Default columns for new projects (Comma-separated)'), 'board_columns') ?>
     <?= $this->form->text('board_columns', $values, $errors) ?><br/>
     <p class="form-help"><?= t('Default values are "%s"', $default_columns) ?></p>

tests/units/TaskCreationTest.php

@@ -2,6 +2,7 @@
 
 require_once __DIR__.'/Base.php';
 
+use Model\Config;
 use Model\Task;
 use Model\TaskCreation;
 use Model\TaskFinder;
@@ -383,4 +384,27 @@ class TaskCreationTest extends Base
         $this->assertNotFalse($task);
         $this->assertEquals(3, $task['score']);
     }
+
+    public function testDefaultColor()
+    {
+        $p = new Project($this->container);
+        $tc = new TaskCreation($this->container);
+        $tf = new TaskFinder($this->container);
+        $c = new Config($this->container);
+
+        $this->assertEquals(1, $p->create(array('name' => 'test')));
+        $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'test1')));
+
+        $task = $tf->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals('yellow', $task['color_id']);
+
+        $this->assertTrue($c->save(array('default_color' => 'orange')));
+
+        $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'test2')));
+
+        $task = $tf->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals('orange', $task['color_id']);
+    }
 }