Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -184,6 +184,7 @@ class programModel extends model
|
||||
/* Init vars. */
|
||||
$this->loadModel('project');
|
||||
$programs = $this->getList($status, $orderBy, $pager);
|
||||
|
||||
if(empty($programs)) return array();
|
||||
|
||||
$programIdList = array_keys($programs);
|
||||
@@ -208,9 +209,10 @@ class programModel extends model
|
||||
foreach($programs as $programID => $program)
|
||||
{
|
||||
$orderBy = $program->template == 'cmmi' ? 'id_asc' : 'id_desc';
|
||||
$program->projects = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
|
||||
$program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0;
|
||||
$program->estimate = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
|
||||
$program->projects = $this->project->getProjectStats($status, 0, 0, $itemCounts, $orderBy, $pager, $programID);
|
||||
$program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0;
|
||||
$program->estimate = isset($estimates[$programID]) ? $estimates[$programID]->estimate : 0;
|
||||
$program->parentName = $this->project->getProjectParentName($program->parent);
|
||||
}
|
||||
|
||||
return $programs;
|
||||
|
||||
Reference in New Issue
Block a user