ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Job page: show queued as well as running builds

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-22 12:51:00 +01:00
parent 1643d90d92
commit 6dbb948f1f
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Controller/Job.pm
View file

@ -29,9 +29,9 @@ sub overview : Chained('job') PathPart('') Args(0) {
[ $c->stash->{job}->builds->search({ finished => 1 }, [ $c->stash->{job}->builds->search({ finished => 1 },
{ order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ]; { order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ];
$c->stash->{runningBuilds} = [ $c->stash->{queuedBuilds} = [
$c->stash->{job}->builds->search( $c->stash->{job}->builds->search(
{ busy => 1 }, { finished => 0 },
{ join => ['project'] { join => ['project']
, order_by => ["priority DESC", "timestamp"] , order_by => ["priority DESC", "timestamp"]
, '+select' => ['project.enabled'] , '+select' => ['project.enabled']

10
src/root/job.tt
View file

@ -11,15 +11,15 @@
<div id="tabs-status" class="tab-pane active"> <div id="tabs-status" class="tab-pane active">
[% IF currentBuilds.size != 0 %] [% IF currentBuilds.size != 0 %]
<h2>Latest builds (latest evaluation)</h2> <h3>Latest builds (latest evaluation)</h3>
[% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %] [% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
[% END %] [% END %]
[% IF runningBuilds.size != 0 %] [% IF queuedBuilds.size != 0 %]
<h2>Running builds</h2> <h3>Queued builds</h3>
[% INCLUDE renderBuildList builds=runningBuilds showSchedulingInfo=1 hideResultInfo=1 %] [% INCLUDE renderBuildList builds=queuedBuilds showSchedulingInfo=1 hideResultInfo=1 %]
[% END %] [% END %]
[% IF lastBuilds.size != 0 %] [% IF lastBuilds.size != 0 %]
<h2>Last 10 builds</h2> <h3>Last 10 builds</h3>
[% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %] [% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %]
[% END %] [% END %]
</div> </div>

4
src/root/static/css/hydra.css
View file

@ -15,10 +15,6 @@ th {
display: none; display: none;
} }
h3 {
margin-top: 1em;
}
table.productList { table.productList {
border-collapse: separate; border-collapse: separate;
border-spacing: 0em 1em; border-spacing: 0em 1em;