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 2017-05-04 14:00:48 +03:00
commit 0e21863f8c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Ninja/Repositories/TaskRepository.php
View File

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