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

3
tests/API/APIControllerBaseTest.php
View File

@@ -337,6 +337,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'users' => ['result' => 'array', 'type' => 'User'],
'customers' => ['result' => 'array', 'type' => '@Customer'],
'projects' => ['result' => 'array', 'type' => '@Project'],
'activities' => ['result' => 'array', 'type' => '@Activity'],
];
// if a customer is embedded in other objects
@@ -462,6 +463,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'ProjectMeta'],
'parentTitle' => '@string',
'teams' => ['result' => 'array', 'type' => 'Team'],
];
// if a activity is explicitly loaded
@@ -477,6 +479,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'comment' => '@string',
'budget' => 'float',
'timeBudget' => 'int',
'teams' => ['result' => 'array', 'type' => 'Team'],
];
case 'TimesheetEntity':