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

6
src/Repository/ActivityRepository.php
View File

@@ -46,7 +46,7 @@ class ActivityRepository extends EntityRepository
return null;
}
$loader = new ActivityLoader($this->getEntityManager());
$loader = new ActivityLoader($this->getEntityManager(), true);
$loader->loadResults([$activity]);
return $activity;
@@ -75,7 +75,7 @@ class ActivityRepository extends EntityRepository
$activities = $qb->getQuery()->getResult();
$loader = new ActivityLoader($qb->getEntityManager());
$loader = new ActivityLoader($qb->getEntityManager(), true);
$loader->loadResults($activities);
return $activities;
@@ -173,7 +173,7 @@ class ActivityRepository extends EntityRepository
}
if (null !== $user) {
$teams = array_merge($teams, $user->getTeams()->toArray());
$teams = array_merge($teams, $user->getTeams());
}
if (empty($teams)) {