Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:24:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2019-03-26 08:32:29 +02:00
commit cdb0c80acc
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()
->withTrashed()
->with('client', 'invoice', 'project', 'task_status')
->with('client', 'invoice', 'project', 'task_status', 'user')
->orderBy('updated_at', 'desc');
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), [
'id' => (int) $task->public_id,
'user_id' => (int) $task->user->public_id,
'user' => $task->user->getDisplayName(),
'description' => $task->description ?: '',
'duration' => $task->getDuration() ?: 0,
'updated_at' => (int) $this->getTimestamp($task->updated_at),