attributes tweaks

diff --git a/qcg/models.py b/qcg/models.py
index 7205932..8c2be2d 100644 (file)
--- a/qcg/models.py
+++ b/qcg/models.py
@@ -168,8 +168,8 @@ class Task(models.Model):
             self.reserved_time_start, self.reserved_time_finish = value
 
     @property
-    def hosts(self):
-        return {alloc.host_name for alloc in self.allocations.all()}
+    def short_host_names(self):
+        return {alloc.host_name.split('.')[0] for alloc in self.allocations.all()}
 
 
 class Allocation(models.Model):

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index b599429..ef0c801 100644 (file)
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -136,7 +136,7 @@
                             <td>{{ task.start_time }}</td>
                             <td>{{ task.finish_time }}</td>
                             <td>{{ task.get_status_display }}</td>
-                            <td>{{ task.hosts|join:', ' }}</td>
+                            <td>{{ task.short_host_names|join:', ' }}</td>
                         </tr>
                     {% endwith %}
                 {% else %}
@@ -168,7 +168,7 @@
                             <td>{{ task.start_time }}</td>
                             <td>{{ task.finish_time }}</td>
                             <td>{{ task.get_status_display }}</td>
-                            <td>{{ task.hosts|join:', ' }}</td>
+                            <td>{{ task.short_host_names|join:', ' }}</td>
                         </tr>
                     {% endfor %}
                 {% endifequal %}