From 4ec1fd0f4c3abeaac3a049bf13f54f0a053d7882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Fri, 19 Nov 2021 15:56:25 +0800 Subject: [PATCH] * adjust for merge program children. --- api/v1/entries/programs.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/v1/entries/programs.php b/api/v1/entries/programs.php index 0333e849b5..28989e0af5 100644 --- a/api/v1/entries/programs.php +++ b/api/v1/entries/programs.php @@ -32,13 +32,13 @@ class programsEntry extends Entry if(!$data or !isset($data->status)) return $this->sendError(400, 'error'); if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message); - $programs = (array)$data->data->programs; - $progressList = (array)$data->data->progressList; + $programs = $data->data->programs; + $progressList = $data->data->progressList; $users = $data->data->users; $result = array(); foreach($programs as $program) { - if(isset($progressList[$program->id])) $program->progress = $progressList[$program->id]; + if(isset($progressList->{$program->id})) $program->progress = $progressList->{$program->id}; $param = $this->format($program, 'begin:date,end:date,realBegan:date,realEnd:date,openedDate:time,lastEditedDate:time,closedDate:time,canceledDate:time,deleted:bool'); if($mergeChildren) @@ -57,9 +57,9 @@ class programsEntry extends Entry $program->labelBudget = $program->budget != 0 ? zget($this->lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $this->lang->project->future; if(empty($program->parent)) $result[$program->id] = $program; - if(isset($programs[$program->parent])) + if(isset($programs->{$program->parent})) { - $parentProgram = $programs[$program->parent]; + $parentProgram = $programs->{$program->parent}; if(!isset($parentProgram->children)) $parentProgram->children = array(); $parentProgram->children[] = $program; }