isotests: various changes and updates

* isotests/fixtures/clockchoices.json: changed 'default' to 'unchanged'
* isotests/fixtures/filesystems.json: removed 'check the installed
  system' line from one of the options
* isotests/fixtures/modules.json: added
  'ext2','ext3','ext4','swap','xfs','jfs','reiserFS'
* isotests/models.py:
	* Added RollbackOption abstract class that adds the functions
	  get_rollback_success_test and get_rollback_failed_test on top of
	  the IsoOption abstract class for use with the Filesystem and
	  Module classes since Test uses these both in 2 ways (regular and
	  rollback). This keeps them seperated.
	* renamed the related names of these properties from rollback_test
	  to rollback_test_set (seems more in-tune with the other relations)
* isotests/views.py:
	* changed the order of the fields, the automatic order makes no
	  sense.
	* Added help texts to the fields success, filesystem,
	  rollback_filesystem and rollback_modules.
	* Removed help text from modules (made no sense)
	* Added a website field, should remain empty, a simplistic way to
	  hopefully reduce spambot entries.
* templates/isotests/results.html:
	* Removed the rollback yes/no section
	* The rollback labels should check get_rollback_success_test and
	  get_rollback_failed_test.
* Rollback checkbox removed.
* Clearly tell users that success must only be selected if everything
  works right.
* Clearly tell users to only fill in the rollback options if they did a
  rollback.
* Added a thanks page that tells people thanks.
* Added links between the pages.
* Added links to lists with tests of either a specific iso or of any
  iso where a specific option was selected.

Signed-off-by: Dan McGee <dan@archlinux.org>

Conflicts:

	templates/isotests/results.html

5 files changed, 465 insertions, 182 deletions

diff --git a/templates/isotests/add.html b/templates/isotests/add.html
index 07d3ed8..466beb8 100644
--- a/templates/isotests/add.html
+++ b/templates/isotests/add.html
@@ -3,6 +3,8 @@
 {% block title %}Arch Linux - Test Result Entry{% endblock %}
 
 {% block content %}
+<a href="/isotests/">Go back to results</a>
+
 <div class="box">
     <h2>Arch releng iso build test result entry</h2>
     <form action="" method="post">{% csrf_token %}
diff --git a/templates/isotests/result_list.html b/templates/isotests/result_list.html
new file mode 100644
index 0000000..06042b1
--- /dev/null
+++ b/templates/isotests/result_list.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% block content %}
+<a href="/isotests/">Go back to results</a>
+<a href="/isotests/add/">Give feedback</a>
+
+<div class="box">
+    <h2>
+        Results for :
+        {% if option %}
+        {{ option }}: {{ value }}
+        {% endif %}
+
+        {% if iso_name %}
+        {{ iso_name }}
+        {% endif %}
+    </h2>
+
+    <table>
+        <tr>
+            <th>iso</th>
+            <th>nickname</th>
+            <th>success?</th>
+        </tr>
+        {% for test in test_list %}
+        <tr>
+            <td>{{ test.iso.name }}</td>
+            <td>{{ test.user_name }}</td>
+            <td>{{ test.success|yesno }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+</div>
+{% endblock %}
diff --git a/templates/isotests/results.html b/templates/isotests/results.html
index b773056..5d605e8 100644
--- a/templates/isotests/results.html
+++ b/templates/isotests/results.html
@@ -3,188 +3,419 @@
 {% block title %}Arch Linux - Testresults{% endblock %}
 
 {% block content %}
+<a href="/isotests/add/">Give feedback</a>
+
 <div class="box">
-	<h2>Arch releng iso build test results</h2>
-	<table>
-		<tr>
-			<td>
-				<h3>image arch</h3>
-			</td>
-		</tr>
-		{% if architecture_list %}
-		{% for architecture in architecture_list %}
-		<tr>
-			<td>{{ architecture.name }}</td>
-			<td>{{ architecture.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ architecture.get_failed_test|default_if_none:"Never failed"  }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>image type</h3>
-			</td>
-		</tr>
-		{% if iso_type_list %}
-		{% for iso_type in iso_type_list %}
-		<tr>
-			<td>{{ iso_type.name }}</td>
-			<td>{{ iso_type.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ iso_type.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>image boot</h3>
-			</td>
-		</tr>
-		{% if boot_type_list %}
-		{% for boot_type in boot_type_list %}
-		<tr>
-			<td>{{ boot_type.name }}</td>
-			<td>{{ boot_type.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ boot_type.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>hardware type</h3>
-			</td>
-		</tr>
-		{% if hardware_type_list %}
-		{% for hardware_type in hardware_type_list %}
-		<tr>
-			<td>{{ hardware_type.name }}</td>
-			<td>{{ hardware_type.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ hardware_type.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>install type</h3>
-			</td>
-		</tr>
-		{% if install_type_list %}
-		{% for install_type in install_type_list %}
-		<tr>
-			<td>{{ install_type.name }}</td>
-			<td>{{ install_type.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ install_type.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>source selection</h3>
-			</td>
-		</tr>
-		{% if source_list %}
-		{% for source in source_list %}
-		<tr>
-			<td>{{ source.name }}</td>
-			<td>{{ source.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ source.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>clock</h3>
-			</td>
-		</tr>
-		{% if clock_choices_list %}
-		{% for clock_choice in clock_choices_list %}
-		<tr>
-			<td>{{ clock_choice.name }}</td>
-			<td>{{ clock_choice.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ clock_choice.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>partitioning/filesystems</h3>
-			</td>
-		</tr>
-		{% if filesystem_list %}
-		{% for filesystem in filesystem_list %}
-		<tr>
-			<td>{{ filesystem.name }}</td>
-			<td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>fancy stuff</h3>
-			</td>
-		</tr>
-		{% if module_list %}
-		{% for module in module_list %}
-		<tr>
-			<td>{{ module.name }}</td>
-			<td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>rollback</h3>
-			</td>
-		</tr>
-		<tr>
-			<td>yes</td>
-		</tr>
-		<tr>
-			<td>no</td>
-		</tr>
-		<tr>
-			<td>
-				<h4>rollback: partitioning/filesystems</h4>
-			</td>
-		</tr>
-		{% if filesystem_list %}
-		{% for filesystem in filesystem_list %}
-		<tr>
-			<td>{{ filesystem.name }}</td>
-			<td>{{ filesystem.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ filesystem.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h4>rollback: fancy stuff</h4>
-			</td>
-		</tr>
-		{% if module_list %}
-		{% for module in module_list %}
-		<tr>
-			<td>{{ module.name }}</td>
-			<td>{{ module.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ module.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-		<tr>
-			<td>
-				<h3>bootloader</h3>
-			</td>
-		</tr>
-		{% if bootloader_list %}
-		{% for bootloader in bootloader_list %}
-		<tr>
-			<td>{{ bootloader.name }}</td>
-			<td>{{ bootloader.get_success_test|default_if_none:"Never succeeded" }}</td>
-			<td>{{ bootloader.get_failed_test|default_if_none:"Never failed" }}</td>
-		</tr>
-		{% endfor %}
-		{% endif %}
-	</table>
+    <h2>Arch releng iso build test results</h2>
+    <table>
+        <tr>
+            <td>
+                <h3>image arch</h3>
+            </td>
+        </tr>
+        {% if architecture_list %}
+        {% for architecture in architecture_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/architecture/{{ architecture.pk }}/">
+                    {{ architecture.name }}
+                </a>
+            </td>
+            <td>
+                {% if architecture.get_success_test %}
+                <a href="/isotests/results/{{ architecture.get_success_test.pk }}/">
+                    {{ architecture.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if architecture.get_failed_test %}
+                <a href="/isotests/results/{{ architecture.get_failed_test.pk }}/">
+                    {{ architecture.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>image type</h3>
+            </td>
+        </tr>
+        {% if iso_type_list %}
+        {% for iso_type in iso_type_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/iso_type/{{ iso_type.pk }}/">
+                    {{ iso_type.name }}
+                </a>
+            </td>
+            <td>
+                {% if iso_type.get_success_test %}
+                <a href="/isotests/results/{{ iso_type.get_success_test.pk }}/">
+                    {{ iso_type.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if iso_type.get_failed_test %}
+                <a href="/isotests/results/{{ iso_type.get_failed_test.pk }}/">
+                    {{ iso_type.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>image boot</h3>
+            </td>
+        </tr>
+        {% if boot_type_list %}
+        {% for boot_type in boot_type_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/boot_type/{{ boot_type.pk }}/">
+                    {{ boot_type.name }}
+                </a>
+            </td>
+            <td>
+                {% if boot_type.get_success_test %}
+                <a href="/isotests/results/{{ boot_type.get_success_test.pk }}/">
+                    {{ boot_type.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if boot_type.get_failed_test %}
+                <a href="/isotests/results/{{ boot_type.get_failed_test.pk }}/">
+                    {{ boot_type.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>hardware type</h3>
+            </td>
+        </tr>
+        {% if hardware_type_list %}
+        {% for hardware_type in hardware_type_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/hardware_type/{{ hardware_type.pk }}/">
+                    {{ hardware_type.name }}
+                </a>
+            </td>
+            <td>
+                {% if hardware_type.get_success_test %}
+                <a href="/isotests/results/{{ hardware_type.get_success_test.pk }}/">
+                    {{ hardware_type.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if hardware_type.get_failed_test %}
+                <a href="/isotests/results/{{ hardware_type.get_failed_test.pk }}/">
+                    {{ hardware_type.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>install type</h3>
+            </td>
+        </tr>
+        {% if install_type_list %}
+        {% for install_type in install_type_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/install_type/{{ install_type.pk }}/">
+                    {{ install_type.name }}
+                </a>
+            </td>
+            <td>
+                {% if install_type.get_success_test %}
+                <a href="/isotests/results/{{ install_type.get_success_test.pk }}/">
+                    {{ install_type.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if install_type.get_failed_test %}
+                <a href="/isotests/results/{{ install_type.get_failed_test.pk }}/">
+                    {{ install_type.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>source selection</h3>
+            </td>
+        </tr>
+        {% if source_list %}
+        {% for source in source_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/source/{{ source.pk }}/">
+                    {{ source.name }}
+                </a>
+            </td>
+            <td>
+                {% if source.get_success_test %}
+                <a href="/isotests/results/{{ source.get_success_test.pk }}/">
+                    {{ source.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if source.get_failed_test %}
+                <a href="/isotests/results/{{ source.get_failed_test.pk }}/">
+                    {{ source.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>clock</h3>
+            </td>
+        </tr>
+        {% if clock_choices_list %}
+        {% for clock_choice in clock_choices_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/clock_choice/{{ clock_choice.pk }}/">
+                    {{ clock_choice.name }}
+                </a>
+            </td>
+            <td>
+                {% if clock_choice.get_success_test %}
+                <a href="/isotests/results/{{ clock_choice.get_success_test.pk }}/">
+                    {{ clock_choice.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if clock_choice.get_failed_test %}
+                <a href="/isotests/results/{{ clock_choice.get_failed_test.pk }}/">
+                    {{ clock_choice.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>partitioning/filesystems</h3>
+            </td>
+        </tr>
+        {% if filesystem_list %}
+        {% for filesystem in filesystem_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/filesystem/{{ filesystem.pk }}/">
+                    {{ filesystem.name }}
+                </a>
+            </td>
+            <td>
+                {% if filesystem.get_success_test %}
+                <a href="/isotests/results/{{ filesystem.get_success_test.pk }}/">
+                    {{ filesystem.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if filesystem.get_failed_test %}
+                <a href="/isotests/results/{{ filesystem.get_failed_test.pk }}/">
+                    {{ filesystem.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>fancy stuff</h3>
+            </td>
+        </tr>
+        {% if module_list %}
+        {% for module in module_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/modules/{{ module.pk }}/">
+                    {{ module.name }}
+                </a>
+            </td>
+            <td>
+                {% if module.get_success_test %}
+                <a href="/isotests/results/{{ module.get_success_test.pk }}/">
+                    {{ module.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if module.get_failed_test %}
+                <a href="/isotests/results/{{ module.get_failed_test.pk }}/">
+                    {{ module.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h4>rollback: partitioning/filesystems</h4>
+            </td>
+        </tr>
+        {% if filesystem_list %}
+        {% for filesystem in filesystem_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/rollback_filesystem/{{ filesystem.pk }}/">
+                    {{ filesystem.name }}
+                </a>
+            </td>
+            <td>
+                {% if filesystem.get_rollback_success_test %}
+                <a href="/isotests/results/{{ filesystem.get_rollback_success_test.pk }}/">
+                    {{ filesystem.get_rollback_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if filesystem.get_rollback_failed_test %}
+                <a href="/isotests/results/{{ filesystem.get_rollback_failed_test.pk }}/">
+                    {{ filesystem.get_rollback_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h4>rollback: fancy stuff</h4>
+            </td>
+        </tr>
+        {% if module_list %}
+        {% for module in module_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/rollback_modules/{{ module.pk }}/">
+                    {{ module.name }}
+                </a>
+            </td>
+            <td>
+                {% if module.get_rollback_success_test %}
+                <a href="/isotests/results/{{ module.get_rollback_success_test.pk }}/">
+                    {{ module.get_rollback_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if module.get_rollback_failed_test %}
+                <a href="/isotests/results/{{ module.get_rollback_failed_test.pk }}/">
+                    {{ module.get_rollback_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+        <tr>
+            <td>
+                <h3>bootloader</h3>
+            </td>
+        </tr>
+        {% if bootloader_list %}
+        {% for bootloader in bootloader_list %}
+        <tr>
+            <td>
+                <a href="/isotests/results/bootloader/{{ bootloader.pk }}/">
+                    {{ bootloader.name }}
+                </a>
+            </td>
+            <td>
+                {% if bootloader.get_success_test %}
+                <a href="/isotests/results/{{ bootloader.get_success_test.pk }}/">
+                    {{ bootloader.get_success_test.name }}
+                </a>
+                {% else %}
+                Never succeeded
+                {% endif %}
+            </td>
+            <td>
+                {% if bootloader.get_failed_test %}
+                <a href="/isotests/results/{{ bootloader.get_failed_test.pk }}/">
+                    {{ bootloader.get_failed_test.name }}
+                </a>
+                {% else %}
+                Never failed
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+        {% endif %}
+    </table>
 </div>
 {% endblock %}
diff --git a/templates/isotests/thanks.html b/templates/isotests/thanks.html
new file mode 100644
index 0000000..aa4fea2
--- /dev/null
+++ b/templates/isotests/thanks.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+
+{% block title %}Arch Linux - Feedback - Thanks!{% endblock %}
+
+{% block content %}
+<a href="/isotests/">Go back to results</a>
+<a href="/isotests/add">Give more feedback</a>
+
+<div class="box">
+    <h2>Thanks!</h2>
+    Thank you for taking the time to give us this information!
+    Your results have been succesfully added to our database.
+</div>
+{% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index 132412f..aa65121 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -119,6 +119,8 @@
             title="Arch communities in your native language">International Communities</a></li>
         <li><a href="https://wiki.archlinux.org/index.php/Related_Projects"
             title="Projects that are in some way related to Arch Linux">Related Projects</a></li>
+        <li><a href="/isotests/"
+            title="releng-testbuild-feedback">Releng-testbuild-feedback</a></li>
     </ul>
 
     <h4>Support</h4>