Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2745 from RnBConsulting/develop

Browse Source 
Add user id and displayname in task status (API) v2
This commit is contained in:
Hillel Coren 2019-03-22 09:00:18 +02:00 committed by GitHub
commit 96d9b162c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/TaskApiController.php
View File

@ -45,7 +45,7 @@ class TaskApiController extends BaseAPIController
{ {
$tasks = Task::scope() $tasks = Task::scope()
->withTrashed() ->withTrashed()
->with('client', 'invoice', 'project', 'task_status') ->with('client', 'invoice', 'project', 'task_status', 'user')
->orderBy('updated_at', 'desc'); ->orderBy('updated_at', 'desc');
return $this->listResponse($tasks); return $this->listResponse($tasks);

2
app/Ninja/Transformers/TaskTransformer.php
View File

@ -63,6 +63,8 @@ class TaskTransformer extends EntityTransformer
{ {
return array_merge($this->getDefaults($task), [ return array_merge($this->getDefaults($task), [
'id' => (int) $task->public_id, 'id' => (int) $task->public_id,
'user_id' => (int) $task->user->public_id,
'user' => $task->user->getDisplayName(),
'description' => $task->description ?: '', 'description' => $task->description ?: '',
'duration' => $task->getDuration() ?: 0, 'duration' => $task->getDuration() ?: 0,
'updated_at' => (int) $this->getTimestamp($task->updated_at), 'updated_at' => (int) $this->getTimestamp($task->updated_at),