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

support multiple teamleads in each team (#2702)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Repository/CustomerRepository.php
View File

@@ -47,7 +47,7 @@ class CustomerRepository extends EntityRepository
return null;
}
$loader = new CustomerLoader($this->getEntityManager());
$loader = new CustomerLoader($this->getEntityManager(), true);
$loader->loadResults([$customer]);
return $customer;
@@ -168,7 +168,7 @@ class CustomerRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {