diff --git a/module/block/control.php b/module/block/control.php index a240f154b0..b060ec7bce 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1520,6 +1520,7 @@ class block extends control */ public function printOverviewBlock($module = 'product') { + if($module == 'project') $module = 'execution'; $func = 'print' . ucfirst($module) . 'OverviewBlock'; $this->view->module = $module; $this->$func(); @@ -1554,21 +1555,21 @@ class block extends control } /** - * Print project overview block. + * Print execution overview block. * * @access public * @return void */ - public function printProjectOverviewBlock() + public function printExecutionOverviewBlock() { - $programID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ; - $projects = $this->loadModel('project')->getList('all', 0, 0, 0, $programID); + $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ; + $executions = $this->loadModel('project')->getExecutionList($projectID); $total = 0; - foreach($projects as $project) + foreach($executions as $execution) { - if(!isset($overview[$project->status])) $overview[$project->status] = 0; - $overview[$project->status]++; + if(!isset($overview[$execution->status])) $overview[$execution->status] = 0; + $overview[$execution->status]++; $total++; } diff --git a/module/project/control.php b/module/project/control.php index 887c5629dc..b375ee4845 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -23,7 +23,7 @@ class project extends control parent::__construct($moduleName, $methodName); if($this->methodName != 'computeburn') { - $this->projects = $this->project->getPairs('nocode', $this->session->PRJ); + $this->projects = $this->project->getExecutionPairs($this->session->PRJ, 'all', 'nocode'); if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create')); } }