Merge lp:~deeptik/lava-dashboard/bundlestream_pagination into lp:lava-dashboard

[Deepti B. Kalakeri]

Adding pagination feature to bundle stream detail view and correcting some indentation.

[Zygmunt Krynicki (zyga)]

Looks good

review: Approve

=== modified file 'dashboard_server/templates/dashboard_app/bundle_stream_detail.html'
--- dashboard_server/templates/dashboard_app/bundle_stream_detail.html	2010-12-20 11:19:39 +0000
+++ dashboard_server/templates/dashboard_app/bundle_stream_detail.html	2010-12-22 12:54:53 +0000
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load humanize %}
+{% load pagination_tags %}
 
 
 {% block title %}
@@ -39,73 +40,80 @@
 
 {% block content %}
 
-{% if bundle_stream.bundles.count %}
-<table class="data">
-  <tr>
-    <th rowspan="3">{% trans "Uploaded By" %}</th>
-    <th rowspan="3">{% trans "Uploaded On" %}</th>
-    <th rowspan="3">{% trans "Import Status" %}</th>
-    <th style="width: 80%" colspan="7">{% trans "Analysis" %}</th>
-  </tr>
-  <tr>
-    <th rowspan="2">{% trans "Test" %}</th>
-    <th rowspan="2">{% trans "Run" %}</th>
-    <th rowspan="2">{% trans "Analyzed On" %}</th>
-    <th colspan="4">{% trans "Test Results" %}</th>
-  </tr>
-  <tr>
-    <th>{% trans "Pass" %}</th>
-    <th>{% trans "Fail" %}</th>
-    <th>{% trans "Skip" %}</th>
-    <th>{% trans "Unknown" %}</th>
-  </tr>
-  {% for bundle in bundle_stream.bundles.all %}
-    {% if bundle.is_deserialized %}
-      <tr>
-        <td rowspan="{{ bundle.test_runs.count }}">{{ bundle.uploaded_by|default:"<i>anonymous</i>" }}</td>
-        <td rowspan="{{ bundle.test_runs.count }}">{{ bundle.uploaded_on|naturalday }} {{ bundle.uploaded_on|time }}</td>
-        <td rowspan="{{ bundle.test_runs.count }}">{% trans "OK" %}</td>
-        {% for test_run in bundle.test_runs.all %}
-          {% if not forloop.first %}<tr>{% endif %}
-          <td>{{ test_run.test }}</td>
-          <td><a href="{{ test_run.get_absolute_url }}">{{ test_run }}</a></td>
-          <td>{{ test_run.analyzer_assigned_date|naturalday }}</td>
-          {% with test_run.get_summary_results as summary %}
-            <td>{{ summary.pass|default:0 }}</td>
-            <td>{{ summary.fail|default:0 }}</td>
-            <td>{{ summary.skip|default:0 }}</td>
-            <td>{{ summary.unknown|default:0 }}</td>
-          {% endwith %}
-          {% if not forloop.last %}</tr>{% endif %}
-        {% endfor %}
-      </tr>
-    {% else %}
-      <tr>
-        <td>{{ bundle.uploaded_by|default:"<i>anonymous</i>" }}</td>
-        <td>{{ bundle.uploaded_on|naturalday }} {{ bundle.uploaded_on|time }}</td>
-        <td>
-          {% if bundle.deserialization_error.count %}
-            {% trans "Failed" %}
-          {% else %}
-            {% trans "Pending" %}
-          {% endif %}
-        </td>
-        <td colspan="7">
-          {% if bundle.deserialization_error.count %}
-            {{ bundle.deserialization_error.get.error_message }}
-          {% endif %}
-        </td>
-      </tr>
-    {% endif %}
-  {% endfor %}
-</table>
-
+{% autopaginate bundle_stream.bundles.all 5 as bundles %}
+{% if invalid_page %}
+  <h3>{% trans "There is no bundles on this page yet." %}</h3>
+  <p>{% trans "Try the" %} <a href="{{ bundle_stream.get_absolute_url }}">{% trans "first page" %}</a> {% trans "instead." %}</p>
 {% else %}
-
-<p>{% blocktrans %}
-  There are no bundles in this stream yet.
-{% endblocktrans %}</p>
-
+  {% if bundles.count %}
+  <table class="data">
+    <tr>
+      <th rowspan="3">{% trans "Uploaded By" %}</th>
+      <th rowspan="3">{% trans "Uploaded On" %}</th>
+      <th rowspan="3">{% trans "Import Status" %}</th>
+      <th style="width: 80%" colspan="7">{% trans "Analysis" %}</th>
+    </tr>
+    <tr>
+      <th rowspan="2">{% trans "Test" %}</th>
+      <th rowspan="2">{% trans "Run" %}</th>
+      <th rowspan="2">{% trans "Analyzed On" %}</th>
+      <th colspan="4">{% trans "Test Results" %}</th>
+    </tr>
+    <tr>
+      <th>{% trans "Pass" %}</th>
+      <th>{% trans "Fail" %}</th>
+      <th>{% trans "Skip" %}</th>
+      <th>{% trans "Unknown" %}</th>
+    </tr>
+    {% for bundle in bundles %}
+      {% if bundle.is_deserialized %}
+        <tr>
+          <td rowspan="{{ bundle.test_runs.count }}">{{ bundle.uploaded_by|default:"<i>anonymous</i>" }}</td>
+          <td rowspan="{{ bundle.test_runs.count }}">{{ bundle.uploaded_on|naturalday }} {{ bundle.uploaded_on|time }}</td>
+          <td rowspan="{{ bundle.test_runs.count }}">{% trans "OK" %}</td>
+          {% for test_run in bundle.test_runs.all %}
+            {% if not forloop.first %}<tr>{% endif %}
+            <td>{{ test_run.test }}</td>
+            <td><a href="{{ test_run.get_absolute_url }}">{{ test_run }}</a></td>
+            <td>{{ test_run.analyzer_assigned_date|naturalday }}</td>
+            {% with test_run.get_summary_results as summary %}
+              <td>{{ summary.pass|default:0 }}</td>
+              <td>{{ summary.fail|default:0 }}</td>
+              <td>{{ summary.skip|default:0 }}</td>
+              <td>{{ summary.unknown|default:0 }}</td>
+            {% endwith %}
+            {% if not forloop.last %}</tr>{% endif %}
+          {% endfor %}
+        </tr>
+      {% else %}
+        <tr>
+          <td>{{ bundle.uploaded_by|default:"<i>anonymous</i>" }}</td>
+          <td>{{ bundle.uploaded_on|naturalday }} {{ bundle.uploaded_on|time }}</td>
+          <td>
+            {% if bundle.deserialization_error.count %}
+              {% trans "Failed" %}
+            {% else %}
+              {% trans "Pending" %}
+            {% endif %}
+          </td>
+          <td colspan="7">
+            {% if bundle.deserialization_error.count %}
+              {{ bundle.deserialization_error.get.error_message }}
+            {% endif %}
+          </td>
+        </tr>
+      {% endif %}
+    {% endfor %}
+  </table>
+
+  {% else %}
+
+  <p>{% blocktrans %}
+    There are no bundles in this stream yet.
+  {% endblocktrans %}</p>
+
+  {% endif %}
+{% paginate %}
 {% endif %}
 
 {% endblock %}