Include the full changes table in the feed

(by putting it into a template of its own)

Author: nomeata

codespeed/feeds.py

@@ -2,6 +2,8 @@
 from codespeed.models import Report
 from django.conf import settings
 from django.db.models import Q
+from django.shortcuts import render_to_response
+
 
 class ResultFeed(Feed):
     title = settings.WEBSITE_NAME
@@ -13,13 +15,23 @@ def items(self):
             .order_by('-revision__date')[:10]
 
     def item_title(self, item):
-        return unicode(item.revision)
+        return "%s: %s" % (item.revision.get_short_commitid(), item.item_description())
+
+    description_template = "codespeed/changes_table.html"
+
+    def get_context_data(self, **kwargs):
+        report = kwargs['item']
+        trendconfig = settings.TREND
+
+        tablelist = report.get_changes_table(trendconfig)
 
-    def item_description(self, item):
-        if item.summary:
-            return item.summary
-        else:
-            return "No significant changes"
+        return {
+            'tablelist': tablelist,
+            'trendconfig': trendconfig,
+            'rev': report.revision,
+            'exe': report.executable,
+            'env': report.environment,
+        }
 
 class LatestEntries(ResultFeed):
     description = "Last benchmark runs"

codespeed/templates/codespeed/changes_data.html

@@ -0,0 +1,44 @@
+<div class="leftcolumn">
+{% include 'codespeed/changes_table.html' %}
+</div>
+
+<div class="rightcolumn">
+<table class="revision">
+    <col/>
+    <col/>
+<thead>
+  <tr>
+    <th colspan="2">Revision</th>
+  </tr>
+</thead>
+<tbody>
+  <tr class="commit-id">
+    <th class="infofirst">Commit</th>
+    <td>{% if rev.get_browsing_url %}<a href="{{ rev.get_browsing_url }}">{{ rev.commitid }}</a>{% else %}{{ rev.commitid }}{% endif %}</td>
+  </tr>
+  <tr class="date"><th class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
+  {% ifnotequal rev.branch.project.repo_type "N" %}
+    <tr class="repo-path"><th class="infofirst">Repo</th><td>{{ rev.branch.project.repo_path }}</td></tr>
+  {% endifnotequal %}
+</tbody>
+</table>
+
+{% ifnotequal exe.project.repo_type 'N' %}
+  <table class="revision">
+      <col/>
+      <col/>
+    <thead class="commits">
+      <tr>
+        <th colspan="2">Commit logs</th>
+      </tr>
+    </thead>
+    <tbody class="commits" data-commitid="{{ rev.id }}">
+      <tr><td colspan="2" style="text-align:center;">Loading... <img src="{{ STATIC_URL}}images/ajax-loader.gif" align="bottom"></td></tr>
+    </tbody>
+    <script type="text/javascript">
+      var el = $("tbody.commits");
+      el.load("logs/", "revisionid=" + el.data("commitid"));
+    </script>
+</table>
+{% endifnotequal %}
+</div>

codespeed/templates/codespeed/changes_table.html

@@ -1,6 +1,5 @@
 {% load percentages %}
 
-<div class="leftcolumn">
 {% for units in tablelist %}
 <table class="tablesorter" data-lessisbetter="{{ units.lessisbetter }}">
 <thead>
@@ -64,45 +63,3 @@
     <tr><td class="infofirst">Kernel</td><td>{{ env.kernel }}</td></tr>
   </tbody>
 </table>
-</div>
-
-<div class="rightcolumn">
-<table class="revision">
-    <col/>
-    <col/>
-<thead>
-  <tr>
-    <th colspan="2">Revision</th>
-  </tr>
-</thead>
-<tbody>
-  <tr class="commit-id">
-    <th class="infofirst">Commit</th>
-    <td>{% if rev.get_browsing_url %}<a href="{{ rev.get_browsing_url }}">{{ rev.commitid }}</a>{% else %}{{ rev.commitid }}{% endif %}</td>
-  </tr>
-  <tr class="date"><th class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
-  {% ifnotequal rev.branch.project.repo_type "N" %}
-    <tr class="repo-path"><th class="infofirst">Repo</th><td>{{ rev.branch.project.repo_path }}</td></tr>
-  {% endifnotequal %}
-</tbody>
-</table>
-
-{% ifnotequal exe.project.repo_type 'N' %}
-  <table class="revision">
-      <col/>
-      <col/>
-    <thead class="commits">
-      <tr>
-        <th colspan="2">Commit logs</th>
-      </tr>
-    </thead>
-    <tbody class="commits" data-commitid="{{ rev.id }}">
-      <tr><td colspan="2" style="text-align:center;">Loading... <img src="{{ STATIC_URL}}images/ajax-loader.gif" align="bottom"></td></tr>
-    </tbody>
-    <script type="text/javascript">
-      var el = $("tbody.commits");
-      el.load("logs/", "revisionid=" + el.data("commitid"));
-    </script>
-</table>
-{% endifnotequal %}
-</div>

codespeed/views.py

@@ -611,7 +611,7 @@ def getchangestable(request):
                             '<p class="errormessage">No results for this '
                             'parameters</p>')
 
-    return render_to_response('codespeed/changes_table.html', {
+    return render_to_response('codespeed/changes_data.html', {
         'tablelist': tablelist,
         'trendconfig': trendconfig,
         'rev': selectedrev,