AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow to associate tags to colors

Browse Source 
The color is then used as background in the board, list and task details
views
This commit is contained in:
Julian Maurice
2018-08-09 21:35:11 +02:00
parent ae3ade0908
commit 9d4cd31e1a
24 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/units/Formatter/BoardFormatterTest.php
View File

@@ -375,11 +375,13 @@ class BoardFormatterTest extends Base
'id' => 1,
'name' => 'My tag 1',
'task_id' => 1,
'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
'task_id' => 1,
'color_id' => null,
),
);
@@ -391,6 +393,7 @@ class BoardFormatterTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
'color_id' => null,
),
);

5
tests/units/Formatter/TaskListFormatterTest.php
View File

@@ -37,11 +37,13 @@ class TaskListFormatterTest extends Base
'id' => 1,
'name' => 'My tag 1',
'task_id' => 1,
'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
'task_id' => 1,
'color_id' => null,
),
);
@@ -52,10 +54,11 @@ class TaskListFormatterTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
'color_id' => null,
),
);
$this->assertEquals($expected, $listing[1]['tags']);
$this->assertEquals(array(), $listing[2]['tags']);
}
}
}

3
tests/units/Model/TagModelTest.php
View File

@@ -111,10 +111,11 @@ class TagModelTest extends Base
{
$tagModel = new TagModel($this->container);
$this->assertEquals(1, $tagModel->create(0, 'Tag 1'));
$this->assertTrue($tagModel->update(1, 'Tag Updated'));
$this->assertTrue($tagModel->update(1, 'Tag Updated', 'purple'));
$tag = $tagModel->getById(1);
$this->assertEquals(0, $tag['project_id']);
$this->assertEquals('Tag Updated', $tag['name']);
$this->assertEquals('purple', $tag['color_id']);
}
}

10
tests/units/Model/TaskTagModelTest.php
View File

@@ -86,17 +86,20 @@ class TaskTagModelTest extends Base
array(
'id' => 1,
'name' => 'My tag 1',
'task_id' => 1
'task_id' => 1,
'color_id' => null,
),
array(
'id' => 2,
'name' => 'My tag 2',
'task_id' => 1
'task_id' => 1,
'color_id' => null,
),
array(
'id' => 3,
'name' => 'My tag 3',
'task_id' => 1
'task_id' => 1,
'color_id' => null,
),
),
2 => array(
@@ -104,6 +107,7 @@ class TaskTagModelTest extends Base
'id' => 3,
'name' => 'My tag 3',
'task_id' => 2,
'color_id' => null,
)
)
);