diff --git a/module/task/config/form.php b/module/task/config/form.php index 12d3c5984d..ce027e1061 100644 --- a/module/task/config/form.php +++ b/module/task/config/form.php @@ -148,7 +148,6 @@ $config->task->form->start['status'] = array('type' => 'string', 'requ $config->task->form->start['consumed'] = array('type' => 'float', 'required' => false, 'default' => 0); $config->task->form->start['left'] = array('type' => 'float', 'required' => false, 'default' => 0); $config->task->form->start['assignedTo'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->task->form->start['comment'] = array('type' => 'string', 'required' => false, 'control' => 'editor'); $config->task->form->start['realStarted'] = array('type' => 'date', 'required' => false, 'default' => null); $config->task->form->start['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account); $config->task->form->start['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now); diff --git a/module/task/control.php b/module/task/control.php index 660ccfbbb7..4055b8124f 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -433,7 +433,7 @@ class task extends control /* Get the information returned after a task is started. */ $from = zget($output, 'from'); - $response = $this->taskZen->responseAfterChangeStatus($taskData, $from); + $response = $this->taskZen->responseAfterChangeStatus($task, $from); $this->send($response); } diff --git a/module/task/ui/start.html.php b/module/task/ui/start.html.php index 85ee10db8d..9f764736ca 100644 --- a/module/task/ui/start.html.php +++ b/module/task/ui/start.html.php @@ -95,7 +95,7 @@ else set::width('1/3'), set::label($lang->task->realStarted), set::name('realStarted'), - set::control('date'), + set::control('datetime'), set::value(helper::isZeroDate($task->realStarted) ? helper::now() : $task->realStarted) ), formRow diff --git a/module/task/zen.php b/module/task/zen.php index 22e5f306f1..ff91ecf070 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -1342,7 +1342,7 @@ class taskZen extends task $response['message'] = $this->lang->saveSuccess; $response['closeModal'] = true; - $execution = $this->execution->getByID((int)$task->execution); + $execution = $this->loadModel('execution')->getByID((int)$task->execution); $kanbanData = $this->getKanbanData($execution, $regionID); $inLiteKanban = $this->config->vision == 'lite' && $this->app->tab == 'project' && $this->session->kanbanview == 'kanban';