grahamc/hydra - Change 3EJABTVV4M2U77HKHPKMFTR6KAKOXKLUB2PKGE2RRPWCAX2BC56QC

Show build products on aggregates with channels.

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>

Created by aszlig on April 20, 2015

3EJABTVV4M2U77HKHPKMFTR6KAKOXKLUB2PKGE2RRPWCAX2BC56QC

Dependencies

In channels

upstream

main

Change contents

Insertion in src/lib/Hydra/Controller/Build.pm at line 111 [4.1]

[2.164]

[4.1111]


    $c->stash->{isChannel} = $c->stash->{build}->buildproducts->search(
        {type => "channel"}
    )->count > 0;

Replacement in src/root/build.tt at line 191 [6.7350]

B:BD[5.3656] → [3.426:535]

            [% IF !isAggregate && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]

[5.3656]

[3.535]

            [% IF (!isAggregate || !isChannel) && build.finished; actualBuild = build.iscachedbuild ? cachedBuild : build %]

Replacement in src/root/build.tt at line 203 [6.7350]

B:BD[7.59] → [8.2568:2627]

            [% IF !isAggregate && buildLogExists(build) %]

[7.59]

[9.6492]

            [% IF (!isAggregate || !isChannel) && buildLogExists(build) %]

Replacement in src/root/build.tt at line 218 [6.7350]

B:BD[9.9948] → [10.1300:1349]

    [% IF build.buildproducts && !isAggregate %]

[11.843]

[12.1105]

    [% IF isChannel || (build.buildproducts && !isAggregate) %]