diff --git a/module/project/control.php b/module/project/control.php index a91b67eac6..891410701f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -221,6 +221,7 @@ class project extends control $this->view->position[] = html::a(inlink('browse', "projectID=$projectID"), $project->name); $this->view->position[] = $this->lang->project->importTask; $this->view->tasks2Imported = $this->project->getTasks2Imported($projectID); + $this->view->projects = $this->project->getPairs('all'); $this->display(); } diff --git a/module/project/model.php b/module/project/model.php index b609afbcba..3d6adfa88f 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -180,12 +180,13 @@ class projectModel extends model /** * Get project pairs. * + * @param string $mode all|noclosed or empty * @access public * @return array */ - public function getPairs() + public function getPairs($mode = '') { - $mode = $this->cookie->projectMode ? $this->cookie->projectMode : 'noclosed'; + if($mode == '') $mode = $this->cookie->projectMode ? $this->cookie->projectMode : 'noclosed'; $projects = $this->dao->select('*')->from(TABLE_PROJECT) ->where('iscat')->eq(0) ->andWhere('deleted')->eq(0) diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index efca3ced14..951fe10d74 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -37,7 +37,7 @@ assignedTo == $app->user->account ? 'style=color:red' : '';?> - +  id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?> pri;?> >assignedToRealName;?>