1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

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

This commit is contained in:
Hillel Coren 2017-05-04 14:00:48 +03:00
commit 0e21863f8c

View File

@ -134,6 +134,10 @@ class TaskRepository extends BaseRepository
$timeLog = [];
}
if(isset($data['client_id'])) {
$task->client_id = Client::getPrivateId($data['client_id']);
}
array_multisort($timeLog);
if (isset($data['action'])) {
@ -148,7 +152,6 @@ class TaskRepository extends BaseRepository
$task->is_running = false;
} elseif ($data['action'] == 'offline'){
$task->is_running = $data['is_running'] ? 1 : 0;
$task->client_id = $data['client_id'];
}
}