From c1ccc88d0769afc16363ceb06e5bdcd8605455bf Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 17 Apr 2012 15:36:33 -0500
Subject: Prune down table rows on ISO testing overview page

This table is getting very long as we have upwards of 210 ISOs in the
production database. However, it doesn't make much sense to list ISOs
that no longer exist and were never tested, so omit these from the
results page if we know this to be the case.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 releng/views.py                    | 10 ++++++++--
 templates/releng/iso_overview.html |  6 ++++++
 templates/releng/results.html      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/releng/views.py b/releng/views.py
index d8ea59f9..fc81d410 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -177,12 +177,18 @@ def submit_test_thanks(request):
 
 def iso_overview(request):
     isos = Iso.objects.all().order_by('-pk')
-    successes = dict(Iso.objects.values_list('pk').filter(test__success=True).annotate(ct=Count('test')))
-    failures = dict(Iso.objects.values_list('pk').filter(test__success=False).annotate(ct=Count('test')))
+    successes = dict(Iso.objects.values_list('pk').filter(
+        test__success=True).annotate(ct=Count('test')))
+    failures = dict(Iso.objects.values_list('pk').filter(
+        test__success=False).annotate(ct=Count('test')))
     for iso in isos:
         iso.successes = successes.get(iso.pk, 0)
         iso.failures = failures.get(iso.pk, 0)
 
+    # only show "useful" rows, currently active ISOs or those with results
+    isos = [iso for iso in isos if
+            iso.active == True or iso.successes > 0 or iso.failures > 0]
+
     context = {
         'isos': isos
     }
diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html
index ca5a8c08..447ba487 100644
--- a/templates/releng/iso_overview.html
+++ b/templates/releng/iso_overview.html
@@ -6,6 +6,12 @@
 <div class="box">
     <h2>Failures and Successes for Testing ISOs</h2>
 
+    <p>This is an overview showing all current or tested release engineering
+    produced ISOs. Past but now unavailable ISOs are ommitted if there were
+    never any testing results submitted. To help improve ISO quality, you are
+    encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>
+    if you have tested and used any ISOs. Both successful and failed results
+    are encouraged and welcome.</p>
     <p><a href="{% url 'releng-test-overview' %}">Go back to testing results</a></p>
 
     <table id="releng-result" class="results">
diff --git a/templates/releng/results.html b/templates/releng/results.html
index 71af708f..c19b42a6 100644
--- a/templates/releng/results.html
+++ b/templates/releng/results.html
@@ -7,7 +7,7 @@
 <div class="box">
     <h2>Release Engineering Testbuild Results</h2>
 
-    <p>This is an overview screen showing a test results matrix of release
+    <p>This is an overview showing a test results matrix of release
     engineering produced ISOs. Various options and configurations are shown
     with last success and last failure results, if known. To help improve ISO
     quality, you are encouraged to <a href="{% url 'releng-test-submit' %}">give feedback</a>
-- 
cgit v1.2.3-54-g00ecf