Show aggregate members

This commit is contained in:
Eelco Dolstra 2013-08-15 00:30:19 +02:00
parent d30b49ebac
commit 81322de94e
3 changed files with 16 additions and 1 deletions

View file

@ -552,6 +552,8 @@ __PACKAGE__->has_many(
__PACKAGE__->many_to_many("jobsetevals", "jobsetevalmembers", "eval"); __PACKAGE__->many_to_many("jobsetevals", "jobsetevalmembers", "eval");
__PACKAGE__->many_to_many("members_", "aggregatemembers_aggregates", "member");
sub makeSource { sub makeSource {
my ($name, $query) = @_; my ($name, $query) = @_;
my $source = __PACKAGE__->result_source_instance(); my $source = __PACKAGE__->result_source_instance();

View file

@ -68,6 +68,7 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li> <li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li>
[% IF build.members_ %]<li><a href="#tabs-members" data-toggle="tab">Members</a></li>[% END %]
<li><a href="#tabs-details" data-toggle="tab">Details</a></li> <li><a href="#tabs-details" data-toggle="tab">Details</a></li>
<li><a href="#tabs-buildinputs" data-toggle="tab">Inputs</a></li> <li><a href="#tabs-buildinputs" data-toggle="tab">Inputs</a></li>
[% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %] [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
@ -251,6 +252,18 @@
</div> </div>
[% IF build.members_ %]
<div id="tabs-members" class="tab-pane">
<p>This build is an aggregate of the following builds:</p>
[% INCLUDE renderBuildList builds=build.members_ %]
</div>
[% END %]
<div id="tabs-details" class="tab-pane"> <div id="tabs-details" class="tab-pane">
<table class="info-table"> <table class="info-table">

View file

@ -99,7 +99,7 @@ BLOCK renderBuildListBody;
[% END %] [% END %]
<td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td> <td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
<td class="nowrap"><tt>[% build.system %]</tt></td> <td class="nowrap"><tt>[% build.system %]</tt></td>
<td class="nowrap">[% date.format(showSchedulingInfo ? build.timestamp : build.stoptime, '%Y-%m-%d %H:%M:%S') %]</td> <td class="nowrap">[% t = showSchedulingInfo ? build.timestamp : build.stoptime; IF t; date.format(showSchedulingInfo ? build.timestamp : build.stoptime, '%Y-%m-%d %H:%M:%S'); ELSE; "-"; END %]</td>
[% IF showStatusChange %] [% IF showStatusChange %]
<td> <td>
[% IF build.get_column('statusChangeTime') %] [% IF build.get_column('statusChangeTime') %]