[bug 1111026] Fix hb error page paging

* increase page size from 25 to 100 * switch the sort order so most recent things are first * fix the paging links by lifting the fixes from the hb data page
mozilla · Dec 12, 2014 · 9e3cec6 · 9e3cec6
1 parent fdc5c54
commit 9e3cec6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/fjord/analytics/analyzer_views.py b/fjord/analytics/analyzer_views.py
@@ -109,7 +109,8 @@ def hb_errorlog(request, errorid=None):
 
     else:
         page = request.GET.get('page')
-        paginator = Paginator(Record.objects.filter(app='heartbeat'), 25)
+        paginator = Paginator(
+            Record.objects.filter(app='heartbeat').order_by('-id'), 100)
         try:
             errors = paginator.page(page)
         except PageNotAnInteger:

diff --git a/fjord/analytics/templates/analytics/analyzer/hb_errorlog.html b/fjord/analytics/templates/analytics/analyzer/hb_errorlog.html
@@ -1,6 +1,30 @@
 {% extends "analytics/analyzer/dashboard.html" %}
 {# Note: This is not l10n-ized since it's only available to analyzers for now. #}
 
+{% macro page_links(request, sortby, errors) %}
+  <div class="pager">
+    {% if errors.has_previous() %}
+      <a class="prev-link" href="{{ request.get_full_path()|urlparams(sortby=sortby, page=errors.previous_page_number()) }}">
+        Prev
+      </a>
+    {% else %}
+      Prev
+    {% endif %}
+    | Page {{ errors.number }} of {{ errors.paginator.num_pages }} |
+    {% if errors.has_next() %}
+      <a class="next-link" href="{{ request.get_full_path()|urlparams(sortby=sortby, page=errors.next_page_number()) }}">
+        Next
+      </a>
+    {% else %}
+      Next
+    {% endif %}
+    |
+    <a class="first-link" href="{{ request.get_full_path()|urlparams(sortby=sortby, page=1) }}">First</a>
+    |
+    <a class="last-link" href="{{ request.get_full_path()|urlparams(sortby=sortby, page=errors.paginator.num_pages) }}">Last</a>
+  </div>
+{% endmacro %}
+
 {% block content %}
   <div class="col full">
     <div class="block feedback">
@@ -33,23 +57,7 @@ <h2>Heartbeat v2 errorlog</h2>
       {% else %}
         <h2>Total errors: {{ errors.paginator.count }}</h2>
 
-        <div class="pager">
-          {% if next_page %}
-            <a class="older" href="{{ request.get_full_path()|urlparams(page=errors.previous_page_number) }}">
-              Older
-            </a>
-          {% else %}
-            Older
-          {% endif %}
-          | Page {{ errors.number }} of {{ errors.paginator.num_pages }} |
-          {% if prev_page %}
-            <a class="newer" href="{{ request.get_full_path()|urlparams(page=errors.next_page_number) }}">
-              Newer
-            </a>
-          {% else %}
-            Newer
-          {% endif %}
-        </div>
+        {{ page_links(request, sortby, errors) }}
 
         <table class="summarytable">
           {% for err in errors %}
@@ -62,23 +70,8 @@ <h2>Total errors: {{ errors.paginator.count }}</h2>
           {% endfor %}
         </table>
 
-        <div class="pager">
-          {% if next_page %}
-            <a class="older" href="{{ request.get_full_path()|urlparams(page=errors.previous_page_number) }}">
-              Older
-            </a>
-          {% else %}
-            Older
-          {% endif %}
-          | Page {{ errors.number }} of {{ errors.paginator.num_pages }} |
-          {% if prev_page %}
-            <a class="newer" href="{{ request.get_full_path()|urlparams(page=errors.next_page_number) }}">
-              Newer
-            </a>
-          {% else %}
-            Newer
-          {% endif %}
-        </div>
+        {{ page_links(request, sortby, errors) }}
+
       {% endif %}
     </div>
   </div>