diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 909704d688..9c60ec3be8 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -52,6 +52,15 @@ if(common::canModify('execution', $execution)) $cols = $this->loadModel('datatable')->getSetting('execution'); $tableData = initTableData($tasks, $cols, $this->task); +$tableData = array_map( + function($task) + { + if(helper::isZeroDate($task->deadline)) $task->deadline = ''; + if(helper::isZeroDate($task->estStarted)) $task->estStarted = ''; + return $task; + }, + $tableData +); toolbar ( diff --git a/module/task/ui/view.html.php b/module/task/ui/view.html.php index ca5b0a6a4f..1db4ae73d8 100644 --- a/module/task/ui/view.html.php +++ b/module/task/ui/view.html.php @@ -481,7 +481,7 @@ detailBody item ( set::name($lang->task->estStarted), - $task->estStarted + helper::isZeroDate($task->estStarted) ? '' : $task->estStarted ), item ( @@ -491,7 +491,7 @@ detailBody item ( set::name($lang->task->deadline), - $task->deadline + helper::isZeroDate($task->deadline) ? '' : $task->deadline ) ) ),