tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed task bug

Browse source
This commit is contained in:
Hillel Coren 2015-09-02 23:33:47 +03:00
parent 4d71b193d6
commit 5bf287f51a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/TaskController.php
View file

@ -137,7 +137,7 @@ class TaskController extends BaseController
'url' => 'tasks',
'title' => trans('texts.new_task'),
'timezone' => Auth::user()->account->timezone->name,
'datetimeFormat' => Auth::user()->account->datetime_format->format_moment
'datetimeFormat' => Auth::user()->account->datetime_format ? Auth::user()->account->datetime_format->format_moment : 'DD/MMM/YYYY h:mm:ss a'
];
$data = array_merge($data, self::getViewModel());
@ -188,7 +188,7 @@ class TaskController extends BaseController
'duration' => $task->is_running ? $task->getCurrentDuration() : $task->getDuration(),
'actions' => $actions,
'timezone' => Auth::user()->account->timezone->name,
'datetimeFormat' => Auth::user()->account->datetime_format->format_moment
'datetimeFormat' => Auth::user()->account->datetime_format ? Auth::user()->account->datetime_format->format_moment : 'DD/MMM/YYYY h:mm:ss a'
];
$data = array_merge($data, self::getViewModel());