jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

handle hidden users in teams (#1841)

Browse Source 
* allow to add disabled users to team
* allow to include disabled users in user-select
* include disabled users when editing team members ONLY if they are already part of team
This commit is contained in:
Kevin Papst
2020-07-26 13:13:06 +02:00
committed by GitHub
parent ecea92942c
commit 130e6ac057
9 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Repository/Query/BaseFormTypeQueryTest.php
View File

@@ -44,12 +44,17 @@ abstract class BaseFormTypeQueryTest extends TestCase
self::assertEmpty($sut->getTeams());
self::assertInstanceOf(BaseFormTypeQuery::class, $sut->addTeam(new Team()));
self::assertEquals(1, \count($sut->getTeams()));
self::assertCount(1, $sut->getTeams());
$team = new Team();
self::assertInstanceOf(BaseFormTypeQuery::class, $sut->addTeam($team));
self::assertEquals(1, \count($sut->getTeams()));
self::assertCount(1, $sut->getTeams());
self::assertSame($team, $sut->getTeams()[0]);
self::assertInstanceOf(BaseFormTypeQuery::class, $sut->setTeams([]));
self::assertEmpty($sut->getTeams());
self::assertInstanceOf(BaseFormTypeQuery::class, $sut->setTeams([new Team(), new Team()]));
self::assertCount(2, $sut->getTeams());
}
protected function assertActivity(BaseFormTypeQuery $sut)

12
tests/Repository/Query/UserFormTypeQueryTest.php
View File

@@ -9,6 +9,7 @@
namespace App\Tests\Repository\Query;
use App\Entity\User;
use App\Repository\Query\UserFormTypeQuery;
/**
@@ -23,4 +24,15 @@ class UserFormTypeQueryTest extends BaseFormTypeQueryTest
$this->assertBaseQuery($sut);
}
public function testUsersAreAlwaysIncluded()
{
$sut = new UserFormTypeQuery();
$users = [(new User())->setUsername('foo'), new User(), new User()];
self::assertEquals([], $sut->getUsersAlwaysIncluded());
self::assertInstanceOf(UserFormTypeQuery::class, $sut->setUsersAlwaysIncluded($users));
self::assertSame($users, $sut->getUsersAlwaysIncluded());
}
}