diff --git a/api/v1/entries/executioncases.php b/api/v1/entries/executioncases.php index 8cef23bee0..be10d28b97 100644 --- a/api/v1/entries/executioncases.php +++ b/api/v1/entries/executioncases.php @@ -35,7 +35,7 @@ class executionCasesEntry extends entry $result = array(); foreach($cases as $case) { - $case->statusName = 'name' => $this->lang->testcase->statusList[$case->status]; + $case->statusName = $this->lang->testcase->statusList[$case->status]; $result[] = $this->format($case, 'openedDate:time,reviewedDate:date,lastEditedDate:time,lastRunDate:time'); } diff --git a/api/v1/entries/task.php b/api/v1/entries/task.php index ad28eb410e..3afe36fafd 100644 --- a/api/v1/entries/task.php +++ b/api/v1/entries/task.php @@ -108,8 +108,8 @@ class taskEntry extends Entry $control = $this->loadController('task', 'edit'); $control->edit($taskID); - $this->getData(); - if($data->status != 'success' and $data->data->result == 'fail') return $this->sendError(zget($data, 'code', 400), $data->data->message); + $data = $this->getData(); + if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $task = $this->task->getByID($taskID); $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')); } diff --git a/api/v1/entries/taskstart.php b/api/v1/entries/taskstart.php index cf5adaee15..d21d4bb37a 100644 --- a/api/v1/entries/taskstart.php +++ b/api/v1/entries/taskstart.php @@ -22,7 +22,7 @@ class taskStartEntry extends Entry { $task = $this->loadModel('task')->getByID($taskID); - $fields = 'assignedTo,realStarted,comment,left'; + $fields = 'assignedTo,realStarted,consumed,left,comment'; $this->batchSetPost($fields); $control = $this->loadController('task', 'start'); @@ -30,7 +30,7 @@ class taskStartEntry extends Entry $control->start($taskID); $data = $this->getData(); - if(!$data or !isset($data->status)) return $this->send400('error'); + if(!$data) return $this->send400('error'); if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $task = $this->loadModel('task')->getByID($taskID); diff --git a/framework/api/entry.class.php b/framework/api/entry.class.php index 4f4843d83c..6ae1237f45 100644 --- a/framework/api/entry.class.php +++ b/framework/api/entry.class.php @@ -246,6 +246,18 @@ class baseEntry $this->send($code, $response); } + /** + * Send 400 response. + * + * @param string message + * @access public + * @return void + */ + public function send400($message = 'error') + { + $this->sendError(400, $message); + } + /** * Send 404 response. *