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

added team permissions for activities (#1872)

Browse Source
This commit is contained in:
Kevin Papst
2020-08-08 18:50:04 +02:00
committed by GitHub
parent dc162bf385
commit 0914ebf737
84 changed files with 4300 additions and 3279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entity/Timesheet.php
View File

@@ -165,8 +165,8 @@ class Timesheet implements EntityWithMetaFields, ExportItemInterface
* @var Activity
*
* @Serializer\Expose()
* @Serializer\Groups({"Expanded"})
* @SWG\Property(type="array", @SWG\Items(ref="#/definitions/ActivityExpanded"))
* @Serializer\Groups({"Subresource", "Expanded"})
* @SWG\Property(ref="#/definitions/ActivityExpanded")
*
* @ORM\ManyToOne(targetEntity="App\Entity\Activity")
* @ORM\JoinColumn(onDelete="CASCADE", nullable=false)
@@ -180,7 +180,7 @@ class Timesheet implements EntityWithMetaFields, ExportItemInterface
*
* @Serializer\Expose()
* @Serializer\Groups({"Subresource", "Expanded"})
* @SWG\Property(type="array", @SWG\Items(ref="#/definitions/ProjectExpanded"))
* @SWG\Property(ref="#/definitions/ProjectExpanded")
*
* @ORM\ManyToOne(targetEntity="App\Entity\Project")
* @ORM\JoinColumn(onDelete="CASCADE", nullable=false)