diff --git a/module/my/control.php b/module/my/control.php index d683f1f131..7594b17506 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -837,13 +837,20 @@ EOF; $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); - $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution; - $this->view->position[] = $this->lang->my->execution; - $this->view->tabID = 'project'; - $this->view->executions = $this->user->getObjects($this->app->user->account, 'execution', $type, $orderBy, $pager); - $this->view->type = $type; - $this->view->pager = $pager; - $this->view->mode = 'execution'; + $executions = $this->user->getObjects($this->app->user->account, 'execution', $type, $orderBy, $pager); + $parentGroup = $this->dao->select('parent, id')->from(TABLE_PROJECT) + ->where('parent')->in(array_keys($executions)) + ->andWhere('type')->in('stage,kanban,sprint') + ->fetchGroup('parent', 'id'); + + $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->execution; + $this->view->position[] = $this->lang->my->execution; + $this->view->tabID = 'project'; + $this->view->executions = $executions; + $this->view->parentGroup = $parentGroup; + $this->view->type = $type; + $this->view->pager = $pager; + $this->view->mode = 'execution'; $this->display(); } diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index 2c7b73f4c9..e45749f02c 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -46,9 +46,10 @@ + id]);?> createLink('execution', 'browse', "id=$execution->id", '', '', $execution->project);?> - id));?> + id) : html::a($link, sprintf('%03d', $execution->id));?> systemMode == 'ALM'):?> type === 'kanban') echo "{$lang->execution->kanban} "; ?> - name, '', "title='$execution->name'");?> + name : html::a($link, $execution->name, '', "title='$execution->name'");?> delay)):?>