summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--app/Controller/Group.php2
-rw-r--r--app/Model/ProjectPermission.php6
-rw-r--r--app/ServiceProvider/RouteProvider.php7
-rw-r--r--tests/units/Model/ProjectPermissionTest.php177
5 files changed, 196 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ad0649d..48c8802d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Version 1.0.23 (unreleased)
+---------------------------
+
+Bug fixes:
+
+- Fix wrong constant name that cause a PHP error in project management section
+- Fix pagination in group members listing
+
Version 1.0.22
--------------
diff --git a/app/Controller/Group.php b/app/Controller/Group.php
index 395a954d..3e6505e9 100644
--- a/app/Controller/Group.php
+++ b/app/Controller/Group.php
@@ -42,7 +42,7 @@ class Group extends Base
$group = $this->group->getById($group_id);
$paginator = $this->paginator
- ->setUrl('group', 'users')
+ ->setUrl('group', 'users', array('group_id' => $group_id))
->setMax(30)
->setOrder('username')
->setQuery($this->groupMember->getQuery($group_id))
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php
index b311c10b..f74b8587 100644
--- a/app/Model/ProjectPermission.php
+++ b/app/Model/ProjectPermission.php
@@ -28,10 +28,10 @@ class ProjectPermission extends Base
return $this
->db
- ->table(self::TABLE)
+ ->table(ProjectUserRole::TABLE)
->join(User::TABLE, 'id', 'user_id')
->join(Project::TABLE, 'id', 'project_id')
- ->eq(self::TABLE.'.role', $role)
+ ->eq(ProjectUserRole::TABLE.'.role', $role)
->eq(Project::TABLE.'.is_private', 0)
->in(Project::TABLE.'.id', $project_ids)
->columns(
@@ -88,7 +88,7 @@ class ProjectPermission extends Base
*/
public function isMember($project_id, $user_id)
{
- return in_array($this->projectUserRole->getUSerRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER));
+ return in_array($this->projectUserRole->getUserRole($project_id, $user_id), array(Role::PROJECT_MEMBER, Role::PROJECT_MANAGER));
}
/**
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 6b1d0d88..26ab488a 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -57,6 +57,13 @@ class RouteProvider implements ServiceProviderInterface
$container['router']->addRoute('project/:project_id/permissions', 'ProjectPermission', 'index', array('project_id'));
$container['router']->addRoute('project/:project_id/import', 'taskImport', 'step1', array('project_id'));
+ // ProjectUser routes
+ $container['router']->addRoute('projects/managers/:user_id', 'projectuser', 'managers', array('user_id'));
+ $container['router']->addRoute('projects/members/:user_id', 'projectuser', 'members', array('user_id'));
+ $container['router']->addRoute('projects/tasks/:user_id/opens', 'projectuser', 'opens', array('user_id'));
+ $container['router']->addRoute('projects/tasks/:user_id/closed', 'projectuser', 'closed', array('user_id'));
+ $container['router']->addRoute('projects/managers', 'projectuser', 'managers');
+
// Action routes
$container['router']->addRoute('project/:project_id/actions', 'action', 'index', array('project_id'));
$container['router']->addRoute('project/:project_id/action/:action_id/confirm', 'action', 'confirm', array('project_id', 'action_id'));
diff --git a/tests/units/Model/ProjectPermissionTest.php b/tests/units/Model/ProjectPermissionTest.php
index 8f118cd9..77419bec 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);
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-17 14:47:35 +0000