From abc7c483c25ebfad07ab425939de107c89966d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Wed, 1 Jun 2022 17:25:02 +0800 Subject: [PATCH 1/3] * Modify taskrecordestimate api. --- api/v1/entries/taskrecordestimate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index 9b0dae7740..0253760e64 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -20,7 +20,7 @@ class taskRecordEstimateEntry extends Entry */ public function get($taskID) { - if($this->config->edition != 'open') + if($this->loadModel('effort')) { $control = $this->loadController('effort', 'createForObject'); $control->createForObject('task', $taskID); @@ -36,8 +36,8 @@ class taskRecordEstimateEntry extends Entry if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $effort = array(); - if($this->config->edition != 'open' and $data->data->efforts) $effort = $data->data->efforts; - if($this->config->edition == 'open' and $data->data->estimates) $effort = $data->data->estimates; + if($this->loadModel('effort') and $data->data->efforts) $effort = $data->data->efforts; + if($this->loadModel('effort') and $data->data->estimates) $effort = $data->data->estimates; $this->send(200, array('effort' => $effort)); } @@ -51,7 +51,7 @@ class taskRecordEstimateEntry extends Entry */ public function post($taskID) { - if($this->config->edition != 'open') + if($this->loadModel('effort')) { $fields = 'id,dates,consumed,left,objectType,objectID,work'; $this->batchSetPost($fields); From ff596bfd6744548b8f80754280a4d3a4e2c6cd99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Mon, 6 Jun 2022 10:17:02 +0800 Subject: [PATCH 2/3] * Fix bug. --- api/v1/entries/taskrecordestimate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index 0253760e64..0f8acab651 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -36,8 +36,8 @@ class taskRecordEstimateEntry extends Entry if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $effort = array(); - if($this->loadModel('effort') and $data->data->efforts) $effort = $data->data->efforts; - if($this->loadModel('effort') and $data->data->estimates) $effort = $data->data->estimates; + if($this->loadModel('effort') and $data->data->efforts) $effort = $data->data->efforts; + if(!$this->loadModel('effort') and $data->data->estimates) $effort = $data->data->estimates; $this->send(200, array('effort' => $effort)); } From 7b19aa7af83a6eeaf2f4b17df6d3202486f13428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Mon, 6 Jun 2022 14:29:21 +0800 Subject: [PATCH 3/3] * Modify. --- api/v1/entries/taskrecordestimate.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index 0f8acab651..b6e87b068d 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -20,7 +20,8 @@ class taskRecordEstimateEntry extends Entry */ public function get($taskID) { - if($this->loadModel('effort')) + $issetEffort = $this->loadModel('effort') ? true : false; + if($issetEffort) { $control = $this->loadController('effort', 'createForObject'); $control->createForObject('task', $taskID); @@ -36,8 +37,8 @@ class taskRecordEstimateEntry extends Entry if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); $effort = array(); - if($this->loadModel('effort') and $data->data->efforts) $effort = $data->data->efforts; - if(!$this->loadModel('effort') and $data->data->estimates) $effort = $data->data->estimates; + if($issetEffort and $data->data->efforts) $effort = $data->data->efforts; + if(!$issetEffort and $data->data->estimates) $effort = $data->data->estimates; $this->send(200, array('effort' => $effort)); }