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

fix find activity for project (#3681)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-07 22:42:02 +01:00
committed by GitHub
parent db0e555eae
commit b8b3a3c8ab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Activity/ActivityService.php
View File

@@ -104,6 +104,6 @@ class ActivityService
public function findActivityByName(string $name, ?Project $project = null): ?Activity public function findActivityByName(string $name, ?Project $project = null): ?Activity
{ {
return $this->repository->findOneBy(['project' => $project, 'name' => $name]); return $this->repository->findOneBy(['project' => $project->getId(), 'name' => $name]);
} }
} }

2
src/Command/ImportTimesheetCommand.php
View File

@@ -508,7 +508,7 @@ class ImportTimesheetCommand extends Command
{ {
$tmpActivity = null; $tmpActivity = null;
$tmpActivities = $this->activities->findBy(['project' => $project, 'name' => $activity]); $tmpActivities = $this->activities->findBy(['project' => $project->getId(), 'name' => $activity]);
if (\count($tmpActivities) === 0) { if (\count($tmpActivities) === 0) {
$tmpActivity = $this->activities->findOneBy(['project' => null, 'name' => $activity]); $tmpActivity = $this->activities->findOneBy(['project' => null, 'name' => $activity]);