From 7954617a0593632d749d7e8b60beab2aae1669ba Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 17 Aug 2011 01:26:23 +0200 Subject: New page ISO Overview ISO Overview shows a simple list of all the ISOs that are available and how many times they've been tested successfully or have failed. Signed-off-by: Tom Willemsen Signed-off-by: Dan McGee --- templates/releng/iso_overview.html | 48 ++++++++++++++++++++++++++++++++++++++ templates/releng/results.html | 3 +++ templates/releng/thanks.html | 4 +++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 templates/releng/iso_overview.html (limited to 'templates/releng') diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html new file mode 100644 index 00000000..ee3aaed3 --- /dev/null +++ b/templates/releng/iso_overview.html @@ -0,0 +1,48 @@ +{% extends "base.html" %} + +{% block content %} +
+

Failures and Successes for Testing ISOs

+ +

Go back to testing results

+ + + + + + + + + + + + {% for iso in isos %} + + + + + + + {% endfor %} + +
ISOCurrently Available# Successes# Failures
+ + {{ iso.name }} + + + {{ iso.active|yesno }} + + {{ iso.successes }} + + {{ iso.failures }} +
+
+{% load cdn %}{% jquery %} + + + +{% endblock %} diff --git a/templates/releng/results.html b/templates/releng/results.html index c3e7d99a..4ff3c864 100644 --- a/templates/releng/results.html +++ b/templates/releng/results.html @@ -13,6 +13,9 @@

Release Engineering Testbuild Results

if you have tested and used any ISOs. Both successful and failed results are encouraged and welcome.

+

For a overview of which ISOs tested best, have a look at + the overview.

+

For more information, see the documentation on the wiki.

diff --git a/templates/releng/thanks.html b/templates/releng/thanks.html index b261426d..80018b03 100644 --- a/templates/releng/thanks.html +++ b/templates/releng/thanks.html @@ -8,6 +8,8 @@

Thanks!

Thank you for taking the time to give us this information! Your results have been succesfully added to our database.

You can now go back to the results, - or give more feedback.

+ give more feedback, or + have a look at the look at + the ISO test overview.

{% endblock %} -- cgit v1.2.3-54-g00ecf From a489f355ec52dd54946bc7476615aa7cab9e384c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 17 Aug 2011 07:57:41 -0500 Subject: Implement get_absolute_url for Iso model Signed-off-by: Dan McGee --- releng/models.py | 4 ++++ templates/releng/iso_overview.html | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'templates/releng') diff --git a/releng/models.py b/releng/models.py index ceac948b..3afef55e 100644 --- a/releng/models.py +++ b/releng/models.py @@ -1,3 +1,4 @@ +from django.core.urlresolvers import reverse from django.db import models from django.db.models.signals import pre_save @@ -48,6 +49,9 @@ class Iso(models.Model): removed = models.DateTimeField(null=True, blank=True, default=None) active = models.BooleanField(default=True) + def get_absolute_url(self): + return reverse('releng-results-iso', args=[self.pk]) + def __unicode__(self): return self.name diff --git a/templates/releng/iso_overview.html b/templates/releng/iso_overview.html index ee3aaed3..054e0fa7 100644 --- a/templates/releng/iso_overview.html +++ b/templates/releng/iso_overview.html @@ -19,9 +19,7 @@

Failures and Successes for Testing ISOs

{% for iso in isos %} - - {{ iso.name }} - + {{ iso.name }} {{ iso.active|yesno }} -- cgit v1.2.3-54-g00ecf From 61311701a51cc5b060d5baa56536805aa271f9d6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 17 Aug 2011 08:11:23 -0500 Subject: Add architecture to releng results listing Signed-off-by: Dan McGee --- releng/views.py | 5 +++-- templates/releng/result_list.html | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'templates/releng') diff --git a/releng/views.py b/releng/views.py index d90a5b9a..796fc044 100644 --- a/releng/views.py +++ b/releng/views.py @@ -115,7 +115,7 @@ def test_results_overview(request): def test_results_iso(request, iso_id): iso = get_object_or_404(Iso, pk=iso_id) - test_list = iso.test_set.all() + test_list = iso.test_set.select_related() context = { 'iso_name': iso.name, 'test_list': test_list @@ -127,7 +127,8 @@ def test_results_for(request, option, value): raise Http404 option_model = getattr(Test, option).field.rel.to real_value = get_object_or_404(option_model, pk=value) - test_list = real_value.test_set.order_by('-iso__name', '-pk') + test_list = real_value.test_set.select_related().order_by( + '-iso__name', '-pk') context = { 'option': option, 'value': real_value, diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index b3ae025b..a343257e 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -12,9 +12,10 @@

Results for: - + + @@ -24,6 +25,7 @@

Results for:

+ {% endfor %} -- cgit v1.2.3-54-g00ecf From a52c2744bf3b532f3f02ce45ae9d902706f9f518 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 17 Aug 2011 16:16:32 -0500 Subject: Add capfirst filter to yesno usage in templates Signed-off-by: Dan McGee --- templates/mirrors/mirror_details.html | 10 +++++----- templates/mirrors/mirrors.html | 6 +++--- templates/packages/signoffs.html | 4 ++-- templates/releng/iso_overview.html | 12 +++--------- templates/releng/result_list.html | 2 +- 5 files changed, 14 insertions(+), 20 deletions(-) (limited to 'templates/releng') diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html index 1795d0f5..3daf1a2d 100644 --- a/templates/mirrors/mirror_details.html +++ b/templates/mirrors/mirror_details.html @@ -24,16 +24,16 @@

Mirror Details: {{ mirror.name }}

 - + {% if user.is_authenticated %} - + - + @@ -91,8 +91,8 @@

Available URLs

{% for m_url in urls %} - - + + diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html index ee76acbe..bf356080 100644 --- a/templates/mirrors/mirrors.html +++ b/templates/mirrors/mirrors.html @@ -27,11 +27,11 @@

Mirror Overview

title="Mirror details for {{ mirror.name }}">{{ mirror.name }} - + {% if user.is_authenticated %} - - + + {% endif %} diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html index baf85338..a8aa4de2 100644 --- a/templates/packages/signoffs.html +++ b/templates/packages/signoffs.html @@ -35,8 +35,8 @@

Package Signoffs

- + - - - + + + {% endfor %} diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index a343257e..7f9ed452 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -26,7 +26,7 @@

Results for:

- + {% endfor %} -- cgit v1.2.3-54-g00ecf From 871cf5ad2d8a97c2c9f9f20e237999acbf5e5f2a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 17 Aug 2011 20:53:57 -0500 Subject: Use verbose name for releng options display So we see something like 'Hardware Type' instead of 'Hardware_Type'. Signed-off-by: Dan McGee --- releng/views.py | 5 +++-- templates/releng/result_list.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'templates/releng') diff --git a/releng/views.py b/releng/views.py index 7f895a45..2b3d0936 100644 --- a/releng/views.py +++ b/releng/views.py @@ -81,7 +81,7 @@ def calculate_option_overview(field_name): is_rollback = field_name.startswith('rollback_') option = { 'option': model, - 'name': field_name, + 'name': model._meta.verbose_name, 'is_rollback': is_rollback, 'values': [] } @@ -159,11 +159,12 @@ def test_results_for(request, option, value): if option not in Test._meta.get_all_field_names(): raise Http404 option_model = getattr(Test, option).field.rel.to + option_model.verbose_name = option_model._meta.verbose_name real_value = get_object_or_404(option_model, pk=value) test_list = real_value.test_set.select_related().order_by( '-iso__name', '-pk') context = { - 'option': option, + 'option': option_model, 'value': real_value, 'value_id': value, 'test_list': test_list diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index 7f9ed452..0233bf8c 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -3,7 +3,7 @@ {% block content %}

Results for: - {% if option %}{{ option|title }}: {{ value }}{% endif %} + {% if option %}{{ option.verbose_name|title }}: {{ value }}{% endif %} {{ iso_name|default:"" }}

-- cgit v1.2.3-54-g00ecf From 5e5182ba9b727e112b3bd16f94f41a2fc5847804 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 19 Aug 2011 13:08:26 -0500 Subject: Add color to releng results success column Signed-off-by: Dan McGee --- media/archweb.css | 8 ++++++++ templates/releng/result_list.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'templates/releng') diff --git a/media/archweb.css b/media/archweb.css index be455680..92487d93 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -930,6 +930,14 @@ ul.admin-actions { position: relative; top: -0.9em; } +#releng-result .success-yes { + color: green; +} + +#releng-result .success-no { + color: red; +} + /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a, #archnavbar.anb-packages ul li#anb-packages a, diff --git a/templates/releng/result_list.html b/templates/releng/result_list.html index 0233bf8c..845d330d 100644 --- a/templates/releng/result_list.html +++ b/templates/releng/result_list.html @@ -26,7 +26,7 @@

Results for:

- + {% endfor %} -- cgit v1.2.3-54-g00ecf
IsoISO Submitted By Date SubmittedArchitecture Success
{{ test.iso.name }} {{ test.user_name }} {{ test.created|date }}{{ test.architecture }} {{ test.success|yesno }}
Has ISOs:{{ mirror.isos|yesno }}{{ mirror.isos|yesno|capfirst }}
Public:{{ mirror.public|yesno }}{{ mirror.public|yesno|capfirst }}
Active:{{ mirror.active|yesno }}{{ mirror.active|yesno|capfirst }}
Rsync IPs:
{% if m_url.protocol.is_download %}{{ m_url.url }}{% else %}{{ m_url.url }}{% endif %}{{ m_url.has_ipv4|yesno }}{{ m_url.has_ipv6|yesno }}{{ m_url.has_ipv4|yesno|capfirst }}{{ m_url.has_ipv6|yesno|capfirst }} {{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }} {{ m_url.completion_pct|percentage:1 }} {{ m_url.delay|duration|default:'unknown' }} {{mirror.get_tier_display}} {{mirror.country}}{{mirror.isos|yesno}}{{mirror.isos|yesno|capfirst}} {{mirror.supported_protocols|join:", "}}{{mirror.public|yesno}}{{mirror.active|yesno}}{{mirror.public|yesno|capfirst}}{{mirror.active|yesno|capfirst}} {{mirror.admin_email}} {{mirror.notes|linebreaks}} {{ pkg.full_version }} {{ pkg.last_update|date }} {{ group.target_repo }} - {{ group.approved|yesno:"Yes,No" }} + {{ group.approved|yesno|capfirst }} {{ iso.name }} - {{ iso.active|yesno }} - - {{ iso.successes }} - - {{ iso.failures }} - {{ iso.active|yesno|capfirst }}{{ iso.successes }}{{ iso.failures }}
{{ test.user_name }} {{ test.created|date }} {{ test.architecture }}{{ test.success|yesno }}{{ test.success|yesno|capfirst }}
{{ test.user_name }} {{ test.created|date }} {{ test.architecture }}{{ test.success|yesno|capfirst }}{{ test.success|yesno|capfirst }}