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

fix activity import Kimai v1 (#1001)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-01 21:38:28 +02:00
committed by GitHub
parent 8104a67e3e
commit 22e30b1871
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Command/KimaiImporterCommand.php
View File

@@ -830,9 +830,9 @@ class KimaiImporterCommand extends Command
$activity = new Activity(); $activity = new Activity();
$activity $activity
->setName($name) ->setName($name)
->setComment($oldActivity['comment'] ?: null) ->setComment($oldActivity['comment'] ?? null)
->setVisible($isActive) ->setVisible($isActive)
->setBudget($oldActivity['budget'] ?: 0) ->setBudget($oldActivity['budget'] ?? 0)
; ;
if (null !== $projectId) { if (null !== $projectId) {
@@ -1059,7 +1059,7 @@ class KimaiImporterCommand extends Command
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
$timesheet $timesheet
->setDescription($oldRecord['description'] ?: ($oldRecord['comment'] ?: null)) ->setDescription($oldRecord['description'] ?? ($oldRecord['comment'] ?? null))
->setUser($this->users[$oldRecord['userID']]) ->setUser($this->users[$oldRecord['userID']])
->setBegin($begin) ->setBegin($begin)
->setEnd($end) ->setEnd($end)