forked from lix-project/hydra
Job page: show queued as well as running builds
This commit is contained in:
parent
1643d90d92
commit
6dbb948f1f
|
@ -29,9 +29,9 @@ sub overview : Chained('job') PathPart('') Args(0) {
|
|||
[ $c->stash->{job}->builds->search({ finished => 1 },
|
||||
{ order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ];
|
||||
|
||||
$c->stash->{runningBuilds} = [
|
||||
$c->stash->{queuedBuilds} = [
|
||||
$c->stash->{job}->builds->search(
|
||||
{ busy => 1 },
|
||||
{ finished => 0 },
|
||||
{ join => ['project']
|
||||
, order_by => ["priority DESC", "timestamp"]
|
||||
, '+select' => ['project.enabled']
|
||||
|
|
|
@ -11,15 +11,15 @@
|
|||
|
||||
<div id="tabs-status" class="tab-pane active">
|
||||
[% IF currentBuilds.size != 0 %]
|
||||
<h2>Latest builds (latest evaluation)</h2>
|
||||
<h3>Latest builds (latest evaluation)</h3>
|
||||
[% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
|
||||
[% END %]
|
||||
[% IF runningBuilds.size != 0 %]
|
||||
<h2>Running builds</h2>
|
||||
[% INCLUDE renderBuildList builds=runningBuilds showSchedulingInfo=1 hideResultInfo=1 %]
|
||||
[% IF queuedBuilds.size != 0 %]
|
||||
<h3>Queued builds</h3>
|
||||
[% INCLUDE renderBuildList builds=queuedBuilds showSchedulingInfo=1 hideResultInfo=1 %]
|
||||
[% END %]
|
||||
[% IF lastBuilds.size != 0 %]
|
||||
<h2>Last 10 builds</h2>
|
||||
<h3>Last 10 builds</h3>
|
||||
[% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %]
|
||||
[% END %]
|
||||
</div>
|
||||
|
|
|
@ -15,10 +15,6 @@ th {
|
|||
display: none;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
table.productList {
|
||||
border-collapse: separate;
|
||||
border-spacing: 0em 1em;
|
||||
|
|
Loading…
Reference in a new issue