Merge commit '0fc8eade38879945b0f2193e37a08a061b8569e0' into jinja

Conflicts: buildbot/status/web/grid.py
djmitche · Dec 19, 2009 · 89a5852 · 89a5852
2 parents 8276d4b + 0fc8ead
commit 89a5852
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/buildbot/status/web/grid.py b/buildbot/status/web/grid.py
@@ -55,6 +55,7 @@ def head(self, request):
             head += '<meta http-equiv="refresh" content="%d">\n' % reload_time
         return head
 
+
     def build_cxt(self, request, build):
         if not build:
             return {}
@@ -247,10 +248,10 @@ def body(self, request):
         sortedBuilderNames.sort()
 
         cxt['sorted_builder_names'] = sortedBuilderNames
-        cxt['builder_builds'] = builder_builds = {}
+        cxt['builder_builds'] = builder_builds = []
         cxt['builders'] = builders = []
         cxt['range'] = range(len(stamps))
-
+        
         for bn in sortedBuilderNames:
             builds = [None] * len(stamps)
 
@@ -267,7 +268,7 @@ def body(self, request):
                 build = build.getPreviousBuild()
 
             builders.append(self.builder_cxt(request, builder))
-            builder_builds[bn] = map(lambda b: self.build_cxt(request, b), builds)
+            builder_builds.append(map(lambda b: self.build_cxt(request, b), builds))
 
         template = request.site.buildbot_service.templates.get_template('grid_transposed.html')
         data = template.render(**cxt)

diff --git a/buildbot/status/web/templates/grid_macros.html b/buildbot/status/web/templates/grid_macros.html
@@ -36,7 +36,7 @@
 
 {% macro build_td(build) -%}
   <td class="build {{ build.class }}">
-    <a href="{{ build.url }}">{{ build.text|e|join('<br/>') }}</a>
+    <a href="{{ build.url }}">{{ build.text|join('<br/>') }}</a>
   </td>
 {%- endmacro %}
 
diff --git a/buildbot/status/web/templates/grid_transposed.html b/buildbot/status/web/templates/grid_transposed.html
@@ -14,8 +14,8 @@
 {% for i in range %}
  <tr>
  {{ grid.stamp_td(stamps[i]) }}
- {% for bn in sorted_builder_names %}
-   {{ grid.build_td(builder_builds[bn][i]) }}
+ {% for b in builder_builds %}
+   {{ grid.build_td(b[i]) }}
  {% endfor %}
  </tr>
 {% endfor %}