Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for merge program children.

Browse Source
This commit is contained in:
王怡栋
2021-11-19 15:56:25 +08:00
parent c849afe0cd
commit 4ec1fd0f4c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/programs.php
+5 -5
View File
@@ -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;
}