support multiple teamleads in each team (#2702)

* fix jumping avatars
* fix line-break after color dot for long names
This commit is contained in:
Kevin Papst
2021-08-07 18:05:41 +02:00
committed by GitHub
parent e9986c92d6
commit b2d3272151
101 changed files with 1952 additions and 649 deletions

View File

@@ -13,7 +13,7 @@ use App\Entity\User;
class TeamQuery extends BaseQuery
{
public const TEAM_ORDER_ALLOWED = ['id', 'name', 'teamlead'];
public const TEAM_ORDER_ALLOWED = ['id', 'name'];
/**
* @var User[]

View File

@@ -9,6 +9,8 @@
namespace App\Repository\Query;
use App\Entity\Team;
/**
* Can be used for advanced queries with the: UserRepository
*/
@@ -22,6 +24,7 @@ class UserQuery extends BaseQuery implements VisibilityInterface
* @var string|null
*/
private $role;
private $searchTeams = [];
public function __construct()
{
@@ -30,6 +33,22 @@ class UserQuery extends BaseQuery implements VisibilityInterface
]);
}
/**
* @return Team[]
*/
public function getSearchTeams(): array
{
return $this->searchTeams;
}
/**
* @param Team[] $searchTeams
*/
public function setSearchTeams(array $searchTeams): void
{
$this->searchTeams = $searchTeams;
}
public function getRole(): ?string
{
return $this->role;