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

fixes for 1.15 (#2704)

Browse Source
This commit is contained in:
Kevin Papst
2021-08-08 12:38:19 +02:00
committed by GitHub
parent b2d3272151
commit c063aed867
19 changed files with 203 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Entity/User.php
View File

@@ -522,28 +522,27 @@ class User implements UserInterface, EquatableInterface, \Serializable
throw new \InvalidArgumentException('Cannot set foreign user membership');
}
if (null !== ($existing = $this->findMember($member))) {
$existing->setTeamlead($member->isTeamlead());
// when using the API an invalid user id does not trigger the validation first, but after calling this method :-(
if ($member->getTeam() === null) {
return;
}
// when using the API an invalid team id does not trigger the validation first, but after calling this method :-(
if ($member->getTeam() !== null) {
$this->memberships->add($member);
$member->getTeam()->addMember($member);
if (null !== ($existing = $this->findMember($member))) {
return;
}
$this->memberships->add($member);
$member->getTeam()->addMember($member);
}
public function removeMembership(TeamMember $member): void
{
$existingMember = $this->findMember($member);
if ($existingMember === null) {
if (null === ($member = $this->findMember($member))) {
return;
}
$this->memberships->removeElement($existingMember);
$existingMember->getUser()->removeMembership($existingMember);
$this->memberships->removeElement($member);
$member->getUser()->removeMembership($member);
}
/**