diff --git a/module/common/model.php b/module/common/model.php index 27852bef15..920e38de2d 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -544,8 +544,8 @@ class commonModel extends model echo '

  • '; echo '
  • ' . $this->lang->recent . '
  • '; - $recentProjects = $this->dao->select('id,code')->from(TABLE_PROJECT) - ->where('type')->eq('project') + $recentProjects = $this->dao->select('id,parent,name')->from(TABLE_PROJECT) + ->where('type')->in('stage,sprint') ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() ->andWhere('status')->ne('close') ->andWhere('deleted')->eq('0') @@ -555,7 +555,10 @@ class commonModel extends model if(!empty($recentProjects)) { - foreach($recentProjects as $project) echo '
  • ' . html::a(helper::createLink('program', 'index', 'projectID=' . $project->id), $project->code) . '
  • '; + foreach($recentProjects as $project) + { + echo '
  • ' . html::a(helper::createLink('project', 'task', 'projectID=' . $project->id, '', false, $project->parent), $project->name, '', "class='text-ellipsis' title='$project->name'") . '
  • '; + } if(count($recentProjects) >= 5) echo '
  • ' . $this->lang->more . '
  • '; } diff --git a/module/program/control.php b/module/program/control.php index 58395330ca..90a643dc06 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -752,10 +752,13 @@ class program extends control */ public function ajaxGetRecentProjects() { - $recentProjects = $this->program->getPRJPairs(0, 15); + $recentProjects = $this->program->getPRJRecent(); if(!empty($recentProjects)) { - foreach($recentProjects as $project) echo html::a(helper::createLink('program', 'index', 'projectID=' . $project->id), '' . $project->name); + foreach($recentProjects as $project) + { + echo html::a(helper::createLink('project', 'task', 'projectID=' . $project->id, '', false, $project->parent), '' . $project->name, '', "class='text-ellipsis' title='$project->name'"); + } } } diff --git a/module/program/model.php b/module/program/model.php index 9db28bde73..23ed336a24 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -817,23 +817,28 @@ class programModel extends model * @access public * @return object */ - public function getPRJPairs($projectID = 0, $limit = 0) + public function getPRJPairs($projectID = 0) { - if($limit) - { - return $this->dao->select('id,name')->from(TABLE_PROJECT) - ->where('type')->eq('project') - ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() - ->andWhere('status')->ne('status') - ->andWhere('deleted')->eq('0') - ->orderBy('id_desc') - ->limit('5,' . $limit) - ->fetchAll(); - } - else - { - return $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch(); - } + return $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetch(); + } + + /** + * Get recent projects. + * + * @param int $projectID + * @access public + * @return object + */ + public function getPRJRecent($limit = 15) + { + return $this->dao->select('id,parent,name')->from(TABLE_PROJECT) + ->where('type')->in('stage,sprint') + ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() + ->andWhere('status')->ne('status') + ->andWhere('deleted')->eq('0') + ->orderBy('id_desc') + ->limit('5,' . $limit) + ->fetchAll(); } /**