[SCM] live-studio branch, master, updated. 0515e0ba88e2558cb196c9297ac7f0f33885e70a

Chris Lamb lamby at debian.org
Sun Aug 1 03:58:31 UTC 2010


The following commit has been merged in the master branch:
commit 0515e0ba88e2558cb196c9297ac7f0f33885e70a
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Jul 31 23:57:03 2010 -0400

    Tidy enqueued column

diff --git a/templates/config/view.html b/templates/config/view.html
index becdd35..aa37f07 100644
--- a/templates/config/view.html
+++ b/templates/config/view.html
@@ -14,13 +14,19 @@
 <table cellpadding="5">
 <tr>
   <th>#</th>
-  <th>Enqueued</th>
+  <th>Enqueued/Built</th>
   <th>Status</th>
 </tr>
 {% for build in config.builds.all %}
 <tr>
   <td>{{ build.pk }}</td>
-  <td>{{ build.enqueued|timesince }} ago</td>
+  <td>
+    {% if build.status == "waiting" or build.status == "building" %}
+      {{ build.enqueued|timesince }} ago
+    {% else %}
+      {{ build.finished|timesince }} ago
+    {% endif %}
+  </td>
   <td>
     {% if build.status == "waiting" %}
       <em>Waiting for builder to become available..</em>

-- 
live-studio



More information about the debian-live-changes mailing list