diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index 835a04c02b..fbb608a05a 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -50,27 +50,16 @@ class taskRecordEstimateEntry extends entry */ public function post($taskID) { - if($this->loadModel('effort')) - { - $fields = 'id,dates,consumed,left,objectType,objectID,work'; - $this->batchSetPost($fields); - $control = $this->loadController('effort', 'createForObject'); - $control->createForObject('task', $taskID); - } - else - { - $fields = 'id,dates,consumed,left,work'; - $this->batchSetPost($fields); - $control = $this->loadController('task', 'recordWorkhour'); - $control->recordWorkhour($taskID); - } + $fields = 'date,consumed,left,work'; + $this->batchSetPost($fields); + $control = $this->loadController('task', 'recordWorkhour'); + $control->recordWorkhour($taskID); $data = $this->getData(); if(!$data) return $this->send400('error'); - if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); + if(isset($data->result) and $data->result == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $task = $this->loadModel('task')->getById($taskID); - return $this->send(200, $this->format($task, 'deadline:date,openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,realStarted:time,finishedBy:user,finishedDate:time,closedBy:user,closedDate:time,canceledBy:user,canceledDate:time,lastEditedBy:user,lastEditedDate:time,deleted:bool,mailto:userList')); } }