diff --git a/api/v1/entries/bugclose.php b/api/v1/entries/bugclose.php index 5e58721262..b2de387493 100644 --- a/api/v1/entries/bugclose.php +++ b/api/v1/entries/bugclose.php @@ -34,7 +34,7 @@ class bugCloseEntry extends Entry $bug = $this->bug->getByID($bugID); - $this->send(200, $this->format($bug, 'assignedTo:user,assignedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time')); + $this->send(200, $this->format($bug, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList')); } } diff --git a/api/v1/entries/bugconfirm.php b/api/v1/entries/bugconfirm.php index fea2d6849b..91dc905ee1 100644 --- a/api/v1/entries/bugconfirm.php +++ b/api/v1/entries/bugconfirm.php @@ -34,7 +34,7 @@ class bugConfirmEntry extends Entry $bug = $this->bug->getById($bugID); - $this->send(200, $this->format($bug, 'assignedTo:user,assignedDate:time,lastEditedBy:user,lastEditedDate:time,mailto:userList')); + $this->send(200, $this->format($bug, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList')); } } diff --git a/api/v1/entries/programs.php b/api/v1/entries/programs.php index fd6b589524..10629532c2 100644 --- a/api/v1/entries/programs.php +++ b/api/v1/entries/programs.php @@ -48,7 +48,7 @@ class programsEntry extends Entry unset($program->desc); $program->end = $program->end == LONG_TIME ? $this->lang->program->longTime : $program->end; - $programBudget = $this->loadModel('project')->budgetUnit($program->budget); + $programBudget = $this->loadModel('project')->getBudgetWithUnit($program->budget); $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; diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index ee208754c0..923f31a813 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -72,7 +72,7 @@ createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?> - loadModel('project')->budgetUnit($program->budget);?> + loadModel('project')->getBudgetWithUnit($program->budget);?>