Make channels a product type instead of subtype.

Now we can provide different channel expressions for one particular
channel build. Not sure yet how this would be useful, but I found it
more appropriate to use a type instead of a subtype of "file".

This should get us consistent with the provious commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-04-21 04:22:37 +02:00
parent f6bb8afc30
commit a235de3ad7
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 13 additions and 5 deletions

View file

@ -160,8 +160,7 @@ sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
foreach my $eval (@evals) { foreach my $eval (@evals) {
my @builds = $eval->builds->search( my @builds = $eval->builds->search(
{ 'buildproducts.type' => 'file' { 'buildproducts.type' => 'channel' },
, 'buildproducts.subtype' => 'channel' },
{ join => ["buildproducts"] { join => ["buildproducts"]
, columns => ['id', 'job', 'finished', 'buildstatus'] } , columns => ['id', 'job', 'finished', 'buildstatus'] }
); );

View file

@ -115,8 +115,19 @@
</td> </td>
</tr> </tr>
[% END %]
[% END %] [% CASE "channel" %]
<tr class="product">
<td>
<a href="[% uri %]">
<img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" />
Channel expression tarball <tt>[% product.name %]</tt>
[% IF product.subtype != "-" %]for <tt>[% product.subtype %]</tt>[% END %]
</a>
</td>
</tr>
[% CASE "file" %] [% CASE "file" %]
@ -136,8 +147,6 @@
<img src="[% c.uri_for("/static/images/iso.png") %]" alt="ISO" /> ISO-9660 CD/DVD image <tt>[% product.name %]</tt> <img src="[% c.uri_for("/static/images/iso.png") %]" alt="ISO" /> ISO-9660 CD/DVD image <tt>[% product.name %]</tt>
[% CASE "binary-dist" %] [% CASE "binary-dist" %]
<img src="[% c.uri_for("/static/images/binary-dist.png") %]" alt="Binary distribution" /> Binary distribution <tt>[% product.name %]</tt> <img src="[% c.uri_for("/static/images/binary-dist.png") %]" alt="Binary distribution" /> Binary distribution <tt>[% product.name %]</tt>
[% CASE "channel" %]
<img src="[% c.uri_for("/static/images/channel.png") %]" alt="Channel" /> Channel expressions <tt>[% product.name %]</tt>
[% CASE DEFAULT %] [% CASE DEFAULT %]
File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt> File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
[% END %] [% END %]