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

Display projects on the dashboard and board selector when everybody allowed is checked

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-21 18:16:04 -04:00
parent dd066290e5
commit ed54d852db
2 changed files with 83 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Model/ProjectPermission.php
View File

@@ -316,7 +316,10 @@ class ProjectPermission extends Base
{ {
return $this->db return $this->db
->hashtable(Project::TABLE) ->hashtable(Project::TABLE)
->eq('user_id', $user_id) ->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->join(self::TABLE, 'project_id', 'id') ->join(self::TABLE, 'project_id', 'id')
->getAll('projects.id', 'name'); ->getAll('projects.id', 'name');
} }
@@ -332,7 +335,10 @@ class ProjectPermission extends Base
{ {
return $this->db return $this->db
->table(Project::TABLE) ->table(Project::TABLE)
->eq('user_id', $user_id) ->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->join(self::TABLE, 'project_id', 'id') ->join(self::TABLE, 'project_id', 'id')
->findAllByColumn('projects.id'); ->findAllByColumn('projects.id');
} }
@@ -348,7 +354,10 @@ class ProjectPermission extends Base
{ {
return $this->db return $this->db
->table(Project::TABLE) ->table(Project::TABLE)
->eq('user_id', $user_id) ->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->eq(Project::TABLE.'.is_active', Project::ACTIVE) ->eq(Project::TABLE.'.is_active', Project::ACTIVE)
->join(self::TABLE, 'project_id', 'id') ->join(self::TABLE, 'project_id', 'id')
->findAllByColumn('projects.id'); ->findAllByColumn('projects.id');
@@ -365,7 +374,10 @@ class ProjectPermission extends Base
{ {
return $this->db return $this->db
->hashtable(Project::TABLE) ->hashtable(Project::TABLE)
->eq('user_id', $user_id) ->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->eq(Project::TABLE.'.is_active', Project::ACTIVE) ->eq(Project::TABLE.'.is_active', Project::ACTIVE)
->join(self::TABLE, 'project_id', 'id') ->join(self::TABLE, 'project_id', 'id')
->getAll('projects.id', 'name'); ->getAll('projects.id', 'name');

68
tests/units/ProjectPermissionTest.php
View File

@@ -25,6 +25,22 @@ class ProjectPermissionTest extends Base
$this->assertEquals(array(), $pp->getMembers(1)); $this->assertEquals(array(), $pp->getMembers(1));
$this->assertEquals(array('Unassigned'), $pp->getMemberList(1)); $this->assertEquals(array('Unassigned'), $pp->getMemberList(1));
$this->assertEmpty($pp->getMemberProjects(1));
$this->assertEmpty($pp->getMemberProjects(2));
$this->assertEmpty($pp->getMemberProjects(3));
$this->assertEmpty($pp->getMemberProjectIds(1));
$this->assertEmpty($pp->getMemberProjectIds(2));
$this->assertEmpty($pp->getMemberProjectIds(3));
$this->assertEmpty($pp->getActiveMemberProjectIds(1));
$this->assertEmpty($pp->getActiveMemberProjectIds(2));
$this->assertEmpty($pp->getActiveMemberProjectIds(3));
$this->assertEmpty($pp->getActiveMemberProjects(1));
$this->assertEmpty($pp->getActiveMemberProjects(2));
$this->assertEmpty($pp->getActiveMemberProjects(3));
$this->assertTrue($p->update(array('id' => 1, 'is_everybody_allowed' => 1))); $this->assertTrue($p->update(array('id' => 1, 'is_everybody_allowed' => 1)));
$this->assertTrue($pp->isEverybodyAllowed(1)); $this->assertTrue($pp->isEverybodyAllowed(1));
$this->assertTrue($pp->isUserAllowed(1, 1)); $this->assertTrue($pp->isUserAllowed(1, 1));
@@ -32,6 +48,32 @@ class ProjectPermissionTest extends Base
$this->assertTrue($pp->isUserAllowed(1, 3)); $this->assertTrue($pp->isUserAllowed(1, 3));
$this->assertEquals(array('1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMembers(1)); $this->assertEquals(array('1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMembers(1));
$this->assertEquals(array('Unassigned', '1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMemberList(1)); $this->assertEquals(array('Unassigned', '1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMemberList(1));
$this->assertNotEmpty($pp->getMemberProjects(1));
$this->assertNotEmpty($pp->getMemberProjects(2));
$this->assertNotEmpty($pp->getMemberProjects(3));
$this->assertNotEmpty($pp->getMemberProjectIds(1));
$this->assertNotEmpty($pp->getMemberProjectIds(2));
$this->assertNotEmpty($pp->getMemberProjectIds(3));
$this->assertNotEmpty($pp->getActiveMemberProjectIds(1));
$this->assertNotEmpty($pp->getActiveMemberProjectIds(2));
$this->assertNotEmpty($pp->getActiveMemberProjectIds(3));
$this->assertNotEmpty($pp->getActiveMemberProjects(1));
$this->assertNotEmpty($pp->getActiveMemberProjects(2));
$this->assertNotEmpty($pp->getActiveMemberProjects(3));
$this->assertTrue($p->disable(1));
$this->assertEmpty($pp->getActiveMemberProjectIds(1));
$this->assertEmpty($pp->getActiveMemberProjectIds(2));
$this->assertEmpty($pp->getActiveMemberProjectIds(3));
$this->assertEmpty($pp->getActiveMemberProjects(1));
$this->assertEmpty($pp->getActiveMemberProjects(2));
$this->assertEmpty($pp->getActiveMemberProjects(3));
} }
public function testDisallowEverybody() public function testDisallowEverybody()
@@ -56,11 +98,23 @@ class ProjectPermissionTest extends Base
$pp = new ProjectPermission($this->container); $pp = new ProjectPermission($this->container);
$user = new User($this->container); $user = new User($this->container);
$user->create(array('username' => 'unittest', 'password' => 'unittest')); $this->assertNotFalse($user->create(array('username' => 'unittest', 'password' => 'unittest')));
// We create a project // We create a project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest'))); $this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
$this->assertEmpty($pp->getMemberProjects(1));
$this->assertEmpty($pp->getMemberProjects(2));
$this->assertEmpty($pp->getMemberProjectIds(1));
$this->assertEmpty($pp->getMemberProjectIds(2));
$this->assertEmpty($pp->getActiveMemberProjectIds(1));
$this->assertEmpty($pp->getActiveMemberProjectIds(2));
$this->assertEmpty($pp->getActiveMemberProjects(1));
$this->assertEmpty($pp->getActiveMemberProjects(2));
// We allow the admin user // We allow the admin user
$this->assertTrue($pp->addMember(1, 1)); $this->assertTrue($pp->addMember(1, 1));
$this->assertTrue($pp->addMember(1, 2)); $this->assertTrue($pp->addMember(1, 2));
@@ -75,6 +129,18 @@ class ProjectPermissionTest extends Base
$this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getMembers(1)); $this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getMembers(1));
$this->assertTrue($pp->isUserAllowed(1, 1)); $this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertTrue($pp->isUserAllowed(1, 2)); $this->assertTrue($pp->isUserAllowed(1, 2));
$this->assertNotEmpty($pp->getMemberProjects(1));
$this->assertNotEmpty($pp->getMemberProjects(2));
$this->assertNotEmpty($pp->getMemberProjectIds(1));
$this->assertNotEmpty($pp->getMemberProjectIds(2));
$this->assertNotEmpty($pp->getActiveMemberProjectIds(1));
$this->assertNotEmpty($pp->getActiveMemberProjectIds(2));
$this->assertNotEmpty($pp->getActiveMemberProjects(1));
$this->assertNotEmpty($pp->getActiveMemberProjects(2));
} }
public function testRevokeUser() public function testRevokeUser()