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

Duplicate category color when duplicating projects

Browse Source
This commit is contained in:
Frédéric Guillot
2018-10-02 10:16:30 -07:00
parent 497f36983c
commit b6e0b9cc09
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/CategoryModel.php
View File

@@ -212,7 +212,7 @@ class CategoryModel extends Base
{ {
$categories = $this->db $categories = $this->db
->table(self::TABLE) ->table(self::TABLE)
->columns('name', 'description') ->columns('name', 'description', 'color_id')
->eq('project_id', $src_project_id) ->eq('project_id', $src_project_id)
->asc('name') ->asc('name')
->findAll(); ->findAll();

4
tests/units/Model/CategoryModelTest.php
View File

@@ -212,7 +212,7 @@ class CategoryModelTest extends Base
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1'))); $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Project #2'))); $this->assertEquals(2, $projectModel->create(array('name' => 'Project #2')));
$this->assertEquals(1, $categoryModel->create(array('name' => 'Category #1', 'project_id' => 1, 'description' => 'test'))); $this->assertEquals(1, $categoryModel->create(array('name' => 'Category #1', 'project_id' => 1, 'description' => 'test', 'color_id' => 'blue')));
$this->assertTrue($categoryModel->duplicate(1, 2)); $this->assertTrue($categoryModel->duplicate(1, 2));
@@ -220,10 +220,12 @@ class CategoryModelTest extends Base
$this->assertEquals('Category #1', $category['name']); $this->assertEquals('Category #1', $category['name']);
$this->assertEquals(1, $category['project_id']); $this->assertEquals(1, $category['project_id']);
$this->assertEquals('test', $category['description']); $this->assertEquals('test', $category['description']);
$this->assertEquals('blue', $category['color_id']);
$category = $categoryModel->getById(2); $category = $categoryModel->getById(2);
$this->assertEquals('Category #1', $category['name']); $this->assertEquals('Category #1', $category['name']);
$this->assertEquals(2, $category['project_id']); $this->assertEquals(2, $category['project_id']);
$this->assertEquals('test', $category['description']); $this->assertEquals('test', $category['description']);
$this->assertEquals('blue', $category['color_id']);
} }
} }