Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -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 2016-11-14 15:13:58 +02:00
commit a70380dd88
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
<?php namespace App\Http\Controllers;
use App\Http\Requests\UpdateTaskRequest;
use Auth;
use Response;
use Input;
@ -84,4 +85,38 @@ class TaskApiController extends BaseAPIController
return $this->response($data);
}
/**
* @SWG\Put(
* path="/task/{task_id}",
* tags={"task"},
* summary="Update a task",
* @SWG\Parameter(
* in="body",
* name="body",
* @SWG\Schema(ref="#/definitions/Task")
* ),
* @SWG\Response(
* response=200,
* description="Update task",
* @SWG\Schema(type="object", @SWG\Items(ref="#/definitions/Task"))
* ),
* @SWG\Response(
* response="default",
* description="an ""unexpected"" error"
* )
* )
*/
public function update(UpdateTaskRequest $request)
{
$task = $request->entity();
$task = $this->taskRepo->save($task->public_id, \Illuminate\Support\Facades\Input::all());
return $this->itemResponse($task);
}
}

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

@ -38,10 +38,22 @@ class TaskTransformer extends EntityTransformer
public function transform(Task $task)
{
if($task->invoice)
$invoiceId = $task->invoice->public_id;
else
$invoiceId = null;
return array_merge($this->getDefaults($task), [
'id' => (int) $task->public_id,
'description' => $task->description,
'duration' => $task->getDuration()
'duration' => $task->getDuration(),
'updated_at' => (int) $this->getTimestamp($task->updated_at),
'archived_at' => (int) $this->getTimestamp($task->deleted_at),
'invoice_id' => $invoiceId,
'client_id' => (int) $task->client->public_id,
'is_deleted' => (bool) $task->is_deleted,
'time_log' => $task->time_log,
'is_running' => (bool) $task->is_running,
]);
}
}