", {
- "css": {
- "z-index": 0,
- "position": "absolute",
- "top": 0,
- "bottom": 0,
- "background-color": series.color.border,
- "width": series.progress,
- "opacity": 0.4
- }
- }));
+ if (series.progress != "0%") {
+ block.append(jQuery("
", {
+ "css": {
+ "z-index": 0,
+ "position": "absolute",
+ "top": 0,
+ "bottom": 0,
+ "background-color": series.color.border,
+ "width": series.progress,
+ "opacity": 0.4
+ }
+ }));
+ }
jQuery(rows[rowIdx]).append(block);
rowIdx = rowIdx + 1;
diff --git a/assets/js/src/Router.js b/assets/js/src/Router.js
index 0c96262cb..ab23c0fd4 100644
--- a/assets/js/src/Router.js
+++ b/assets/js/src/Router.js
@@ -30,6 +30,7 @@ jQuery(document).ready(function() {
router.addRoute('analytic-avg-time-column', AvgTimeColumnChart);
router.addRoute('analytic-task-time-column', TaskTimeColumnChart);
router.addRoute('analytic-lead-cycle-time', LeadCycleTimeChart);
+ router.addRoute('analytic-compare-hours', CompareHoursColumnChart);
router.addRoute('gantt-chart', Gantt);
router.dispatch(app);
app.listen();
diff --git a/doc/api-task-procedures.markdown b/doc/api-task-procedures.markdown
index 71d5bd236..f2ca54d1a 100644
--- a/doc/api-task-procedures.markdown
+++ b/doc/api-task-procedures.markdown
@@ -392,10 +392,8 @@ Response example:
- Parameters:
- **id** (integer, required)
- **title** (string, optional)
- - **project_id** (integer, optional)
- **color_id** (string, optional)
- **owner_id** (integer, optional)
- - **creator_id** (integer, optional)
- **date_due**: ISO8601 format (string, optional)
- **description** Markdown content (string, optional)
- **category_id** (integer, optional)
diff --git a/tests/functionals/ApiTest.php b/tests/functionals/ApiTest.php
index 9be22023c..fbb703c9b 100644
--- a/tests/functionals/ApiTest.php
+++ b/tests/functionals/ApiTest.php
@@ -366,6 +366,33 @@ class Api extends PHPUnit_Framework_TestCase
$this->assertEquals('Swimlane A', $swimlanes[2]['name']);
}
+ public function testCreateTaskWithWrongMember()
+ {
+ $task = array(
+ 'title' => 'Task #1',
+ 'color_id' => 'blue',
+ 'owner_id' => 1,
+ 'project_id' => 1,
+ 'column_id' => 2,
+ );
+
+ $task_id = $this->client->createTask($task);
+
+ $this->assertFalse($task_id);
+ }
+
+ public function testGetAllowedUsers()
+ {
+ $users = $this->client->getMembers(1);
+ $this->assertNotFalse($users);
+ $this->assertEquals(array(), $users);
+ }
+
+ public function testAddMember()
+ {
+ $this->assertTrue($this->client->allowUser(1, 1));
+ }
+
public function testCreateTask()
{
$task = array(
@@ -573,20 +600,13 @@ class Api extends PHPUnit_Framework_TestCase
$this->assertEquals('titi@localhost', $user['email']);
}
- public function testGetAllowedUsers()
- {
- $users = $this->client->getMembers(1);
- $this->assertNotFalse($users);
- $this->assertEquals(array(), $users);
- }
-
public function testAllowedUser()
{
$this->assertTrue($this->client->allowUser(1, 2));
$users = $this->client->getMembers(1);
$this->assertNotFalse($users);
- $this->assertEquals(array(2 => 'Titi'), $users);
+ $this->assertEquals(array(1 => 'admin', 2 => 'Titi'), $users);
}
public function testRevokeUser()
@@ -595,7 +615,7 @@ class Api extends PHPUnit_Framework_TestCase
$users = $this->client->getMembers(1);
$this->assertNotFalse($users);
- $this->assertEquals(array(), $users);
+ $this->assertEquals(array(1 => 'admin'), $users);
}
public function testCreateComment()
diff --git a/tests/functionals/UserApiTest.php b/tests/functionals/UserApiTest.php
index 8a80c706f..3c7fc04e7 100644
--- a/tests/functionals/UserApiTest.php
+++ b/tests/functionals/UserApiTest.php
@@ -163,6 +163,12 @@ class UserApi extends PHPUnit_Framework_TestCase
$this->assertEquals(2, $this->admin->createTask('my admin title', 1));
}
+ public function testCreateTaskWithWrongMember()
+ {
+ $this->assertFalse($this->user->createTask(array('title' => 'something', 'project_id' => 2, 'owner_id' => 1)));
+ $this->assertFalse($this->app->createTask(array('title' => 'something', 'project_id' => 1, 'owner_id' => 2)));
+ }
+
public function testGetTask()
{
$task = $this->user->getTask(1);
@@ -218,6 +224,11 @@ class UserApi extends PHPUnit_Framework_TestCase
$this->assertTrue($this->user->moveTaskPosition(2, 1, 2, 1));
}
+ public function testUpdateTaskWithWrongMember()
+ {
+ $this->assertFalse($this->user->updateTask(array('id' => 1, 'title' => 'new title', 'reference' => 'test', 'owner_id' => 1)));
+ }
+
public function testUpdateTask()
{
$this->assertTrue($this->user->updateTask(array('id' => 1, 'title' => 'new title', 'reference' => 'test', 'owner_id' => 2)));
diff --git a/tests/units/Core/CsvTest.php b/tests/units/Core/CsvTest.php
index 7276de7f3..da0be4a34 100644
--- a/tests/units/Core/CsvTest.php
+++ b/tests/units/Core/CsvTest.php
@@ -14,6 +14,10 @@ class CsvTest extends Base
$this->assertEquals(1, Csv::getBooleanValue('TRUE'));
$this->assertEquals(1, Csv::getBooleanValue('true'));
$this->assertEquals(1, Csv::getBooleanValue('T'));
+ $this->assertEquals(1, Csv::getBooleanValue('Y'));
+ $this->assertEquals(1, Csv::getBooleanValue('y'));
+ $this->assertEquals(1, Csv::getBooleanValue('yes'));
+ $this->assertEquals(1, Csv::getBooleanValue('Yes'));
$this->assertEquals(0, Csv::getBooleanValue('0'));
$this->assertEquals(0, Csv::getBooleanValue('123'));
diff --git a/tests/units/Model/ProjectPermissionTest.php b/tests/units/Model/ProjectPermissionTest.php
index 8f118cd90..77419bec7 100644
--- a/tests/units/Model/ProjectPermissionTest.php
+++ b/tests/units/Model/ProjectPermissionTest.php
@@ -13,6 +13,183 @@ use Kanboard\Core\Security\Role;
class ProjectPermissionTest extends Base
{
+ public function testGetQueryByRole()
+ {
+ $userModel = new User($this->container);
+ $projectModel = new Project($this->container);
+ $groupModel = new Group($this->container);
+ $groupMemberModel = new GroupMember($this->container);
+ $groupRoleModel = new ProjectGroupRole($this->container);
+ $userRoleModel = new ProjectUserRole($this->container);
+ $projectPermission = new ProjectPermission($this->container);
+
+ $this->assertEquals(1, $projectModel->create(array('name' => 'Project 1')));
+ $this->assertEquals(2, $projectModel->create(array('name' => 'Project 2')));
+ $this->assertEquals(3, $projectModel->create(array('name' => 'Project 3')));
+
+ $this->assertEquals(2, $userModel->create(array('username' => 'user 1')));
+ $this->assertEquals(3, $userModel->create(array('username' => 'user 2')));
+ $this->assertEquals(4, $userModel->create(array('username' => 'user 3')));
+ $this->assertEquals(5, $userModel->create(array('username' => 'user 4')));
+
+ $this->assertTrue($userRoleModel->addUser(1, 2, Role::PROJECT_MANAGER));
+ $this->assertTrue($userRoleModel->addUser(1, 3, Role::PROJECT_MANAGER));
+ $this->assertTrue($userRoleModel->addUser(1, 4, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(1, 5, Role::PROJECT_MEMBER));
+
+ $this->assertTrue($userRoleModel->addUser(2, 2, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(2, 3, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(2, 5, Role::PROJECT_MANAGER));
+
+ $this->assertTrue($userRoleModel->addUser(3, 4, Role::PROJECT_MANAGER));
+ $this->assertTrue($userRoleModel->addUser(3, 5, Role::PROJECT_VIEWER));
+
+ $this->assertEmpty($projectPermission->getQueryByRole(array(), Role::PROJECT_MANAGER)->findAll());
+
+ $users = $projectPermission->getQueryByRole(array(1, 2), Role::PROJECT_MANAGER)->findAll();
+ $this->assertCount(3, $users);
+ $this->assertEquals('user 1', $users[0]['username']);
+ $this->assertEquals('Project 1', $users[0]['project_name']);
+ $this->assertEquals('user 2', $users[1]['username']);
+ $this->assertEquals('Project 1', $users[1]['project_name']);
+ $this->assertEquals('user 4', $users[2]['username']);
+ $this->assertEquals('Project 2', $users[2]['project_name']);
+
+ $users = $projectPermission->getQueryByRole(array(1), Role::PROJECT_MANAGER)->findAll();
+ $this->assertCount(2, $users);
+ $this->assertEquals('user 1', $users[0]['username']);
+ $this->assertEquals('Project 1', $users[0]['project_name']);
+ $this->assertEquals('user 2', $users[1]['username']);
+ $this->assertEquals('Project 1', $users[1]['project_name']);
+
+ $users = $projectPermission->getQueryByRole(array(1, 2, 3), Role::PROJECT_MEMBER)->findAll();
+ $this->assertCount(4, $users);
+ $this->assertEquals('user 3', $users[0]['username']);
+ $this->assertEquals('Project 1', $users[0]['project_name']);
+ $this->assertEquals('user 4', $users[1]['username']);
+ $this->assertEquals('Project 1', $users[1]['project_name']);
+ $this->assertEquals('user 1', $users[2]['username']);
+ $this->assertEquals('Project 2', $users[2]['project_name']);
+ $this->assertEquals('user 2', $users[3]['username']);
+ $this->assertEquals('Project 2', $users[3]['project_name']);
+
+ $users = $projectPermission->getQueryByRole(array(1, 2, 3), Role::PROJECT_VIEWER)->findAll();
+ $this->assertCount(1, $users);
+ $this->assertEquals('user 4', $users[0]['username']);
+ $this->assertEquals('Project 3', $users[0]['project_name']);
+ }
+
+ public function testEverybodyAllowed()
+ {
+ $projectModel = new Project($this->container);
+ $projectPermission = new ProjectPermission($this->container);
+
+ $this->assertEquals(1, $projectModel->create(array('name' => 'Project 1')));
+ $this->assertEquals(2, $projectModel->create(array('name' => 'Project 2', 'is_everybody_allowed' => 1)));
+
+ $this->assertFalse($projectPermission->isEverybodyAllowed(1));
+ $this->assertTrue($projectPermission->isEverybodyAllowed(2));
+ }
+
+ public function testIsUserAllowed()
+ {
+ $userModel = new User($this->container);
+ $projectModel = new Project($this->container);
+ $groupModel = new Group($this->container);
+ $groupRoleModel = new ProjectGroupRole($this->container);
+ $groupMemberModel = new GroupMember($this->container);
+ $userRoleModel = new ProjectUserRole($this->container);
+ $projectPermission = new ProjectPermission($this->container);
+
+ $this->assertEquals(2, $userModel->create(array('username' => 'user 1')));
+ $this->assertEquals(3, $userModel->create(array('username' => 'user 2')));
+ $this->assertEquals(4, $userModel->create(array('username' => 'user 3')));
+ $this->assertEquals(5, $userModel->create(array('username' => 'user 4')));
+
+ $this->assertEquals(1, $projectModel->create(array('name' => 'Project 1')));
+ $this->assertEquals(2, $projectModel->create(array('name' => 'Project 2')));
+
+ $this->assertEquals(1, $groupModel->create('Group A'));
+
+ $this->assertTrue($groupMemberModel->addUser(1, 2));
+ $this->assertTrue($groupRoleModel->addGroup(1, 1, Role::PROJECT_VIEWER));
+
+ $this->assertTrue($userRoleModel->addUser(1, 3, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(1, 4, Role::PROJECT_MANAGER));
+
+ $this->assertTrue($projectPermission->isUserAllowed(1, 2));
+ $this->assertTrue($projectPermission->isUserAllowed(1, 3));
+ $this->assertTrue($projectPermission->isUserAllowed(1, 4));
+ $this->assertFalse($projectPermission->isUserAllowed(1, 5));
+
+ $this->assertFalse($projectPermission->isUserAllowed(2, 2));
+ $this->assertFalse($projectPermission->isUserAllowed(2, 3));
+ $this->assertFalse($projectPermission->isUserAllowed(2, 4));
+ $this->assertFalse($projectPermission->isUserAllowed(2, 5));
+ }
+
+ public function testIsMember()
+ {
+ $userModel = new User($this->container);
+ $projectModel = new Project($this->container);
+ $groupModel = new Group($this->container);
+ $groupRoleModel = new ProjectGroupRole($this->container);
+ $groupMemberModel = new GroupMember($this->container);
+ $userRoleModel = new ProjectUserRole($this->container);
+ $projectPermission = new ProjectPermission($this->container);
+
+ $this->assertEquals(2, $userModel->create(array('username' => 'user 1')));
+ $this->assertEquals(3, $userModel->create(array('username' => 'user 2')));
+ $this->assertEquals(4, $userModel->create(array('username' => 'user 3')));
+ $this->assertEquals(5, $userModel->create(array('username' => 'user 4')));
+
+ $this->assertEquals(1, $projectModel->create(array('name' => 'Project 1')));
+ $this->assertEquals(2, $projectModel->create(array('name' => 'Project 2')));
+
+ $this->assertEquals(1, $groupModel->create('Group A'));
+
+ $this->assertTrue($groupMemberModel->addUser(1, 2));
+ $this->assertTrue($groupRoleModel->addGroup(1, 1, Role::PROJECT_VIEWER));
+
+ $this->assertTrue($userRoleModel->addUser(1, 3, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(1, 4, Role::PROJECT_MANAGER));
+
+ $this->assertFalse($projectPermission->isMember(1, 2));
+ $this->assertTrue($projectPermission->isMember(1, 3));
+ $this->assertTrue($projectPermission->isMember(1, 4));
+ $this->assertFalse($projectPermission->isMember(1, 5));
+
+ $this->assertFalse($projectPermission->isMember(2, 2));
+ $this->assertFalse($projectPermission->isMember(2, 3));
+ $this->assertFalse($projectPermission->isMember(2, 4));
+ $this->assertFalse($projectPermission->isMember(2, 5));
+ }
+
+ public function testGetActiveProjectIds()
+ {
+ $userModel = new User($this->container);
+ $projectModel = new Project($this->container);
+ $groupModel = new Group($this->container);
+ $groupRoleModel = new ProjectGroupRole($this->container);
+ $groupMemberModel = new GroupMember($this->container);
+ $userRoleModel = new ProjectUserRole($this->container);
+ $projectPermission = new ProjectPermission($this->container);
+
+ $this->assertEquals(2, $userModel->create(array('username' => 'user 1')));
+ $this->assertEquals(3, $userModel->create(array('username' => 'user 2')));
+
+ $this->assertEquals(1, $projectModel->create(array('name' => 'Project 1')));
+ $this->assertEquals(2, $projectModel->create(array('name' => 'Project 2', 'is_active' => 0)));
+
+ $this->assertTrue($userRoleModel->addUser(1, 2, Role::PROJECT_MEMBER));
+ $this->assertTrue($userRoleModel->addUser(2, 2, Role::PROJECT_VIEWER));
+ $this->assertTrue($userRoleModel->addUser(1, 3, Role::PROJECT_VIEWER));
+
+ $this->assertEmpty($projectPermission->getActiveProjectIds(1));
+ $this->assertEquals(array(1), $projectPermission->getActiveProjectIds(2));
+ $this->assertEquals(array(1), $projectPermission->getActiveProjectIds(3));
+ }
+
public function testDuplicate()
{
$userModel = new User($this->container);