From a235de3ad71a490c82a07e67e8236ab4b20cd51c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 21 Apr 2015 04:22:37 +0200
Subject: [PATCH] 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>
---
 src/lib/Hydra/Controller/Jobset.pm |  3 +--
 src/root/product-list.tt           | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm
index d4a0eb5f..92bede32 100644
--- a/src/lib/Hydra/Controller/Jobset.pm
+++ b/src/lib/Hydra/Controller/Jobset.pm
@@ -160,8 +160,7 @@ sub channels_tab : Chained('jobsetChain') PathPart('channels-tab') Args(0) {
 
     foreach my $eval (@evals) {
         my @builds = $eval->builds->search(
-            { 'buildproducts.type' => 'file'
-            , 'buildproducts.subtype' => 'channel' },
+            { 'buildproducts.type' => 'channel' },
             { join => ["buildproducts"]
             , columns => ['id', 'job', 'finished', 'buildstatus'] }
         );
diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 498818c2..5eef9640 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -115,8 +115,19 @@
 
             </td>
           </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" %]
 
@@ -136,8 +147,6 @@
             <img src="[% c.uri_for("/static/images/iso.png") %]" alt="ISO" /> ISO-9660 CD/DVD image <tt>[% product.name %]</tt>
           [% CASE "binary-dist" %]
             <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 %]
             File <tt>[% product.name %]</tt> of type <tt>[% product.subtype %]</tt>
           [% END %]