diff --git a/src/lib/Hydra/Controller/Job.pm b/src/lib/Hydra/Controller/Job.pm index 50b6b875..2e272395 100644 --- a/src/lib/Hydra/Controller/Job.pm +++ b/src/lib/Hydra/Controller/Job.pm @@ -20,15 +20,16 @@ sub job : Chained('/') PathPart('job') CaptureArgs(3) { sub overview : Chained('job') PathPart('') Args(0) { my ($self, $c) = @_; + my $job = $c->stash->{job}; $c->stash->{template} = 'job.tt'; $c->stash->{lastBuilds} = - [ $c->stash->{job}->builds->search({ finished => 1 }, + [ $job->builds->search({ finished => 1 }, { order_by => 'id DESC', rows => 10, columns => [@buildListColumns] }) ]; $c->stash->{queuedBuilds} = [ - $c->stash->{job}->builds->search( + $job->builds->search( { finished => 0 }, { join => ['project'] , order_by => ["priority DESC", "id"] @@ -36,6 +37,27 @@ sub overview : Chained('job') PathPart('') Args(0) { , '+as' => ['enabled'] } ) ]; + + # If this is an aggregate job, then get its constituents. + my @constituents = $c->model('DB::Builds')->search( + { aggregate => { -in => $job->builds->search({}, { columns => ["id"], order_by => "id desc", rows => 10 })->as_query } }, + { join => 'aggregateconstituents_constituents', + columns => ['id', 'job', 'finished', 'buildstatus'], + +select => ['aggregateconstituents_constituents.aggregate'], + +as => ['aggregate'] + }); + + my $aggregates = {}; + my %constituentJobs; + foreach my $b (@constituents) { + my $jobName = $b->get_column('job'); + $aggregates->{$b->get_column('aggregate')}->{$jobName} = + { id => $b->id, finished => $b->finished, buildstatus => $b->buildstatus}; + $constituentJobs{$jobName} = 1; + } + + $c->stash->{aggregates} = $aggregates; + $c->stash->{constituentJobs} = [sort (keys %constituentJobs)]; } diff --git a/src/root/job.tt b/src/root/job.tt index 8722d3df..c9c4b6cb 100644 --- a/src/root/job.tt +++ b/src/root/job.tt @@ -4,6 +4,9 @@ @@ -21,6 +24,71 @@ [% END %] + [% IF constituentJobs.size > 0 %] + +
+ + + + + + [% FOREACH j IN constituentJobs %] + + [% END %] + + + + [% FOREACH agg IN aggregates.keys.nsort.reverse %] + + + [% FOREACH j IN constituentJobs %] + + [% END %] + + [% END %] + +
#[% HTML.escape(j) %]
[% agg %] + [% r = aggregates.$agg.$j; IF r.id %] + + [% INCLUDE renderBuildStatusIcon size=16 build=r %] + + [% END %] +
+ +
+ + + + + + [% FOREACH j IN constituentJobs %] + + [% END %] + + + + [% FOREACH agg IN aggregates.keys.nsort.reverse %] + + + [% FOREACH j IN constituentJobs %] + + [% END %] + + [% END %] + +
#[% HTML.escape(j) %]
[% agg %] + [% r = aggregates.$agg.$j; IF r.id %] + + [% INCLUDE renderBuildStatusIcon size=16 build=r %] + + [% END %] +
+ + +
+ + [% END %] +