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

8
src/Controller/TimesheetTeamController.php
View File

@@ -12,6 +12,7 @@ namespace App\Controller;
use App\Entity\Tag;
use App\Entity\Team;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Event\TimesheetMetaDisplayEvent;
use App\Form\Model\MultiUserTimesheet;
use App\Form\TimesheetAdminEditForm;
@@ -101,14 +102,15 @@ class TimesheetTeamController extends TimesheetAbstractController
if ($createForm->isSubmitted() && $createForm->isValid()) {
try {
/** @var ArrayCollection $users */
/** @var ArrayCollection<User> $users */
$users = $createForm->get('users')->getData();
/** @var ArrayCollection $teams */
/** @var ArrayCollection<Team> $teams */
$teams = $createForm->get('teams')->getData();
$allUsers = $users->toArray();
/** @var Team $team */
foreach ($teams as $team) {
$allUsers = array_merge($allUsers, $team->getUsers()->toArray());
$allUsers = array_merge($allUsers, $team->getUsers());
}
$allUsers = array_unique($allUsers);