Merge "Implement periodic tasks"

[pharos.git] / tools / pharos-dashboard / templates / dashboard / ci_pods.html

diff --git a/tools/pharos-dashboard/templates/dashboard/ci_pods.html b/tools/pharos-dashboard/templates/dashboard/ci_pods.html
index d3e5ff6..2982a6f 100644 (file)
--- a/tools/pharos-dashboard/templates/dashboard/ci_pods.html
+++ b/tools/pharos-dashboard/templates/dashboard/ci_pods.html
@@ -1,5 +1,6 @@
 {% extends "dashboard/table.html" %}
 {% load staticfiles %}
+{% load jenkins_filters %}
 
 {% block table %}
     <thead>
@@ -20,23 +21,24 @@
                 <a target='_blank' href={{ pod.url }}>{{ pod.name }}</a>
             </th>
             <th>
-                <a target='_blank' href={{ pod.slaveurl }}>{{ pod.slavename }}</a>
+                <a target='_blank' href={{ pod.slave.url }}>{{ pod.slave.name }}</a>
             </th>
-            <th style="background-color:{{ pod.status_color }}">
-                {{ pod.status }}
+            <th style="background-color:{{ pod.slave.status | jenkins_status_color }}">
+                {{ pod.slave.status }}
             </th>
-            <th {{ pod.last_job.blink }}>
-                {{ pod.last_job.installer }}
+            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+                {{ pod.slave.last_job_installer }}
             </th>
-            <th {{ pod.last_job.blink }}>
-                {{ pod.last_job.scenario }}
+            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+                {{ pod.slave.last_job_scenario }}
             </th>
-            <th {{ pod.last_job.blink }}>
-                {{ pod.last_job.branch }}
+            <th {{ pod.slave.last_job_result | jenkins_job_blink }}>
+                {{ pod.slave.last_job_branch }}
             </th>
-            <th><a {{ pod.last_job.blink }} style="color:{{ pod.last_job.color }}"
-                                            target='_blank'
-                                            href={{ pod.last_job.url }}>{{ pod.last_job.name }}</a>
+            <th><a {{ pod.slave.last_job_result | jenkins_job_blink }}
+                    style="color:{{ pod.slave.last_job_result | jenkins_job_color }}"
+                    target='_blank'
+                    href={{ pod.slave.last_job_url }}>{{ pod.slave.last_job_name }}</a>
             </th>
         </tr>
     {% endfor %}`