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

* Finish task#41557.

Browse Source
This commit is contained in:
qiyu-xie
2021-08-19 09:16:00 +08:00
parent 567021b12b
commit 1a17dd0207
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/execution/control.php
View File

@@ -1906,17 +1906,8 @@ class execution extends control
/* Up to five closed executions are displayed. */
if($status == 'closed')
{
if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5)
{
$myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true);
$myExecutions[$status]['more'] = $this->lang->execution->showMore;
}
if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5)
{
$kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true);
$kanbanGroup[$projectID][$status]['more'] = $this->lang->execution->showMore;
}
if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true);
if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true);
}
}

19
module/execution/view/executionkanban.html.php
View File

@@ -22,7 +22,7 @@
<tr>
<th><?php echo $lang->execution->doingProject . ' (' . $projectCount . ')';?></th>
<?php foreach($lang->execution->kanbanColType as $status => $colName):?>
<th><?php echo $colName . ' (' . $statusCount[$status] . ')';?></th>
<th><?php echo $colName . ($status != 'closed' ? ' (' . $statusCount[$status] . ')' : '');?></th>
<?php endforeach;?>
</tr>
</thead>
@@ -45,21 +45,7 @@
<div class="board s-<?php echo $colStatus?>">
<div>
<?php if(!empty($executionList[$colStatus])):?>
<?php foreach($executionList[$colStatus] as $executionID => $execution):?>
<?php if($executionID == 'more'):?>
<div class='text-center'>
<?php
if(common::hasPriv('execution', 'all'))
{
echo html::a($this->createLink('execution', 'all', "status=closed&projectID=$projectID"), $execution, '', "title='$execution'");
}
else
{
echo "<span title='$execution'>$execution</span>";
}
?>
</div>
<?php else:?>
<?php foreach($executionList[$colStatus] as $execution):?>
<div class='board-item' <?php if($execution->status == 'doing' and isset($execution->delay)) echo "style='border-left: 3px solid red';";?>>
<div class='table-row'>
<div class='table-col'>
@@ -85,7 +71,6 @@
<?php endif?>
</div>
</div>
<?php endif?>
<?php endforeach?>
<?php endif?>
</div>

1
module/repo/model.php
View File

@@ -1790,6 +1790,7 @@ class repoModel extends model
{
$gitlab = $this->loadModel('gitlab')->getByID($repo->client); // The $repo->client is gitlabID.
if(!$gitlab) return $repo;
$repo->gitlab = $gitlab->id;
$repo->project = $repo->path; // The projectID in gitlab.
$repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $repo->path);