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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285

Browse Source
This commit is contained in:
tianshujie
2023-02-03 09:48:48 +08:00
parent e16e72162e 1f1e8b0836
commit 778f20a47b
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/js/build.js
+11 -1
View File
@@ -16,10 +16,20 @@ $(function()
$('td .execution .label-danger').each(function()
{
$execution = $(this).closest('.execution');
$td = $(this).closest('td');
$td = $(this).closest('td');
if($td.width() < $execution.width())
{
$execution.find('.executionName').css('display', 'inline-block').css('width', $td.width() - $(this).width()).css('overflow', 'hidden').css('float', 'left');
}
})
$('td.c-name .build .icon-code-fork').each(function()
{
$build = $(this).closest('.build');
$td = $(this).closest('td');
if($td.width() < $build.width())
{
$build.find('.buildName').css('display', 'inline-block').css('width', $td.width() - $(this).width()).css('overflow', 'hidden').css('float', 'left');
}
})
})
module/project/view/build.html.php
+6 -4
View File
@@ -71,10 +71,12 @@
<tr data-id="<?php echo $productID;?>">
<td class="c-id-sm text-muted"><?php echo html::a(helper::createLink($module, 'view', "buildID=$build->id"), sprintf('%03d', $build->id), '', "data-app='project'");?></td>
<td class="c-name" title='<?php echo $build->name;?>'>
<?php echo html::a($this->createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");?>
<?php if(!$build->execution):?>
<span class='icon icon-code-fork text-muted' title='<?php echo $lang->build->integrated;?>'></span>
<?php endif;?>
<span class='build'>
<?php echo html::a($this->createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project' class='buildName'");?>
<?php if(!$build->execution):?>
<span class='icon icon-code-fork text-muted' title='<?php echo $lang->build->integrated;?>'></span>
<?php endif;?>
</span>
</td>
<?php if($project->hasProduct):?>
<td class="c-name text-left" title='<?php echo $build->productName;?>'><?php echo $build->productName;?></td>