lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Show build products on aggregates with channels.

Browse source 
This is to get a bit more consistency among channel builds but doesn't
do a radical change on the display. Ideally we may want to have a
channel overview with all the constituents and a small help showing how
the user can add the channel.

Unfortunately, this also introduces an inconsistency: We previously used
the *subtype* "channel", but now we're expecting "channel" as the type
of the product, so we need to change this for the channels overview as
well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-04-21 03:58:51 +02:00
parent 7b60aed5ed
commit f6bb8afc30
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,10 @@ sub build_GET {
# If this is an aggregate build, get its constituents. # If this is an aggregate build, get its constituents.
$c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})]; $c->stash->{constituents} = [$c->stash->{build}->constituents_->search({}, {order_by => ["job"]})];
$c->stash->{isChannel} = $c->stash->{build}->buildproducts->search(
{type => "channel"}
)->count > 0;
} }

6
src/root/build.tt
View file

@ -188,7 +188,7 @@
<td>[% IF cachedBuild; INCLUDE renderFullBuildLink build=cachedBuild; ELSE %]<em>unknown</em>[% END %]</td> <td>[% IF cachedBuild; INCLUDE renderFullBuildLink build=cachedBuild; ELSE %]<em>unknown</em>[% END %]</td>
</tr> </tr>
[% END %] [% END %]
[% IF !isAggregate && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %] [% IF (!isAggregate || !isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]
[% IF actualBuild %] [% IF actualBuild %]
<tr> <tr>
<th>Duration:</th> <th>Duration:</th>
@ -200,7 +200,7 @@
<td>[% INCLUDE renderDateTime timestamp = build.stoptime; %]</td> <td>[% INCLUDE renderDateTime timestamp = build.stoptime; %]</td>
</tr> </tr>
[% END %] [% END %]
[% IF !isAggregate && buildLogExists(build) %] [% IF (!isAggregate || !isChannel) && buildLogExists(build) %]
<tr> <tr>
<th>Logfile:</th> <th>Logfile:</th>
<td> <td>
@ -215,7 +215,7 @@
</tr> </tr>
</table> </table>
[% IF build.buildproducts && !isAggregate %] [% IF isChannel || (build.buildproducts && !isAggregate) %]
<h3>Build products</h3> <h3>Build products</h3>