Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #32459.

Browse Source
This commit is contained in:
Yagami
2023-03-01 17:04:39 +08:00
parent bb6e606e90
commit 48020c2b5d
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+14 -7
View File
@@ -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();
}
module/my/view/execution.html.php
+3 -2
View File
@@ -46,9 +46,10 @@
</thead>
<tbody>
<?php foreach($executions as $execution):?>
<?php $isParent = isset($parentGroup[$execution->id]);?>
<?php $link = $this->createLink('execution', 'browse', "id=$execution->id", '', '', $execution->project);?>
<tr class='text-left'>
<td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
<td><?php echo $isParent ? sprintf('%03d', $execution->id) : html::a($link, sprintf('%03d', $execution->id));?></td>
<td class='c-name text-left'>
<?php if($config->systemMode == 'ALM'):?>
<?php
@@ -57,7 +58,7 @@
if($execution->type === 'kanban') echo "<span class='project-type-label label label-outline label-info'>{$lang->execution->kanban}</span> ";
?>
<?php endif;?>
<?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
<?php echo $isParent ? $execution->name : html::a($link, $execution->name, '', "title='$execution->name'");?>
</td>
<td class="c-status">
<?php if(isset($execution->delay)):?>