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

Working on the time tracker

Browse Source
This commit is contained in:
Hillel Coren 2017-10-01 22:07:15 +03:00
parent b23f4d397b
commit da348fcc96
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/TaskController.php
View File

@ -232,12 +232,6 @@ class TaskController extends BaseController
$task = $this->taskRepo->save($publicId, $request->input()); $task = $this->taskRepo->save($publicId, $request->input());
if ($publicId) {
Session::flash('message', trans('texts.updated_task'));
} else {
Session::flash('message', trans('texts.created_task'));
}
if (in_array($action, ['invoice', 'add_to_invoice'])) { if (in_array($action, ['invoice', 'add_to_invoice'])) {
return self::bulk(); return self::bulk();
} }
@ -246,6 +240,12 @@ class TaskController extends BaseController
$task->time_log = json_decode($task->time_log); $task->time_log = json_decode($task->time_log);
return $task->load(['client.contacts', 'project'])->toJson(); return $task->load(['client.contacts', 'project'])->toJson();
} else { } else {
if ($publicId) {
Session::flash('message', trans('texts.updated_task'));
} else {
Session::flash('message', trans('texts.created_task'));
}
return Redirect::to("tasks/{$task->public_id}/edit"); return Redirect::to("tasks/{$task->public_id}/edit");
} }
} }